Skip to content

Commit 46299b8

Browse files
codemzscodemzs
committed
test.
1 parent 10d753c commit 46299b8

File tree

5 files changed

+40
-67
lines changed

5 files changed

+40
-67
lines changed

‎test/Microsoft.ML.Core.Tests/UnitTests/CoreBaseTestClass.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,19 @@ protected Func<bool> GetColumnComparer(IRow r1, IRow r2, int col, ColumnType typ
153153
switch (type.RawKind)
154154
{
155155
case DataKind.I1:
156-
return GetComparerOne<DvInt1>(r1, r2, col, (x, y) => x.RawValue == y.RawValue);
156+
return GetComparerOne<SByte>(r1, r2, col, (x, y) => x == y);
157157
case DataKind.U1:
158158
return GetComparerOne<byte>(r1, r2, col, (x, y) => x == y);
159159
case DataKind.I2:
160-
return GetComparerOne<DvInt2>(r1, r2, col, (x, y) => x.RawValue == y.RawValue);
160+
return GetComparerOne<Int16>(r1, r2, col, (x, y) => x == y);
161161
case DataKind.U2:
162162
return GetComparerOne<ushort>(r1, r2, col, (x, y) => x == y);
163163
case DataKind.I4:
164-
return GetComparerOne<DvInt4>(r1, r2, col, (x, y) => x.RawValue == y.RawValue);
164+
return GetComparerOne<Int32>(r1, r2, col, (x, y) => x == y);
165165
case DataKind.U4:
166166
return GetComparerOne<uint>(r1, r2, col, (x, y) => x == y);
167167
case DataKind.I8:
168-
return GetComparerOne<DvInt8>(r1, r2, col, (x, y) => x.RawValue == y.RawValue);
168+
return GetComparerOne<Int64>(r1, r2, col, (x, y) => x == y);
169169
case DataKind.U8:
170170
return GetComparerOne<ulong>(r1, r2, col, (x, y) => x == y);
171171
case DataKind.R4:
@@ -196,19 +196,19 @@ protected Func<bool> GetColumnComparer(IRow r1, IRow r2, int col, ColumnType typ
196196
switch (type.ItemType.RawKind)
197197
{
198198
case DataKind.I1:
199-
return GetComparerVec<DvInt1>(r1, r2, col, size, (x, y) => x.RawValue == y.RawValue);
199+
return GetComparerVec<SByte>(r1, r2, col, size, (x, y) => x == y);
200200
case DataKind.U1:
201201
return GetComparerVec<byte>(r1, r2, col, size, (x, y) => x == y);
202202
case DataKind.I2:
203-
return GetComparerVec<DvInt2>(r1, r2, col, size, (x, y) => x.RawValue == y.RawValue);
203+
return GetComparerVec<Int16>(r1, r2, col, size, (x, y) => x == y);
204204
case DataKind.U2:
205205
return GetComparerVec<ushort>(r1, r2, col, size, (x, y) => x == y);
206206
case DataKind.I4:
207-
return GetComparerVec<DvInt4>(r1, r2, col, size, (x, y) => x.RawValue == y.RawValue);
207+
return GetComparerVec<Int32>(r1, r2, col, size, (x, y) => x == y);
208208
case DataKind.U4:
209209
return GetComparerVec<uint>(r1, r2, col, size, (x, y) => x == y);
210210
case DataKind.I8:
211-
return GetComparerVec<DvInt8>(r1, r2, col, size, (x, y) => x.RawValue == y.RawValue);
211+
return GetComparerVec<Int64>(r1, r2, col, size, (x, y) => x == y);
212212
case DataKind.U8:
213213
return GetComparerVec<ulong>(r1, r2, col, size, (x, y) => x == y);
214214
case DataKind.R4:

‎test/Microsoft.ML.Core.Tests/UnitTests/DvTypes.cs

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ namespace Microsoft.ML.Runtime.RunTests
1111
public sealed class DvTypeTests
1212
{
1313
[Fact]
14-
public void TestComparableDvInt4()
14+
public void TestComparableInt32()
1515
{
1616
const int count = 100;
1717

1818
var rand = RandomUtils.Create(42);
19-
var values = new DvInt4[2 * count];
19+
var values = new Int32?[2 * count];
2020
for (int i = 0; i < count; i++)
2121
{
2222
var v = values[i] = rand.Next();
@@ -28,41 +28,13 @@ public void TestComparableDvInt4()
2828
int iv2 = rand.Next(values.Length - 1);
2929
if (iv2 >= iv1)
3030
iv2++;
31-
values[iv1] = DvInt4.NA;
32-
values[iv2] = DvInt4.NA;
31+
values[iv1] = null;
32+
values[iv2] = null;
3333
Array.Sort(values);
3434

35-
Assert.True(values[0].IsNA);
36-
Assert.True(values[1].IsNA);
37-
Assert.True(!values[2].IsNA);
38-
39-
Assert.True((values[0] == values[1]).IsNA);
40-
Assert.True((values[0] != values[1]).IsNA);
41-
Assert.True((values[0] <= values[1]).IsNA);
42-
Assert.True(values[0].Equals(values[1]));
43-
Assert.True(values[0].CompareTo(values[1]) == 0);
44-
45-
Assert.True((values[1] == values[2]).IsNA);
46-
Assert.True((values[1] != values[2]).IsNA);
47-
Assert.True((values[1] <= values[2]).IsNA);
48-
Assert.True(!values[1].Equals(values[2]));
49-
Assert.True(values[1].CompareTo(values[2]) < 0);
50-
51-
for (int i = 3; i < values.Length; i++)
52-
{
53-
DvBool eq = values[i - 1] == values[i];
54-
DvBool ne = values[i - 1] != values[i];
55-
DvBool le = values[i - 1] <= values[i];
56-
bool feq = values[i - 1].Equals(values[i]);
57-
int cmp = values[i - 1].CompareTo(values[i]);
58-
Assert.True(!eq.IsNA);
59-
Assert.True(!ne.IsNA);
60-
Assert.True(eq.IsTrue == ne.IsFalse);
61-
Assert.True(le.IsTrue);
62-
Assert.True(feq == eq.IsTrue);
63-
Assert.True(cmp <= 0);
64-
Assert.True(feq == (cmp == 0));
65-
}
35+
Assert.True(!values[0].HasValue);
36+
Assert.True(!values[1].HasValue);
37+
Assert.True(values[2].HasValue);
6638
}
6739

6840
[Fact]

‎test/Microsoft.ML.Predictor.Tests/TestTransposer.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,19 @@ public void TransposerTest()
148148
ArrayDataViewBuilder builder = new ArrayDataViewBuilder(Env);
149149

150150
// A is to check the splitting of a sparse-ish column.
151-
var dataA = GenerateHelper(rowCount, 0.1, rgen, () => (DvInt4)rgen.Next(), 50, 5, 10, 15);
152-
dataA[rowCount / 2] = new VBuffer<DvInt4>(50, 0, null, null); // Coverage for the null vbuffer case.
151+
var dataA = GenerateHelper(rowCount, 0.1, rgen, () => (Int32)rgen.Next(), 50, 5, 10, 15);
152+
dataA[rowCount / 2] = new VBuffer<Int32>(50, 0, null, null); // Coverage for the null vbuffer case.
153153
builder.AddColumn("A", NumberType.I4, dataA);
154154
// B is to check the splitting of a dense-ish column.
155155
builder.AddColumn("B", NumberType.R8, GenerateHelper(rowCount, 0.8, rgen, rgen.NextDouble, 50, 0, 25, 49));
156156
// C is to just have some column we do nothing with.
157-
builder.AddColumn("C", NumberType.I2, GenerateHelper(rowCount, 0.1, rgen, () => (DvInt2)1, 30, 3, 10, 24));
157+
builder.AddColumn("C", NumberType.I2, GenerateHelper(rowCount, 0.1, rgen, () => (Int16)1, 30, 3, 10, 24));
158158
// D is to check some column we don't have to split because it's sufficiently small.
159159
builder.AddColumn("D", NumberType.R8, GenerateHelper(rowCount, 0.1, rgen, rgen.NextDouble, 3, 1));
160160
// E is to check a sparse scalar column.
161161
builder.AddColumn("E", NumberType.U4, GenerateHelper(rowCount, 0.1, rgen, () => (uint)rgen.Next(int.MinValue, int.MaxValue)));
162162
// F is to check a dense-ish scalar column.
163-
builder.AddColumn("F", NumberType.I4, GenerateHelper(rowCount, 0.8, rgen, () => (DvInt4)rgen.Next()));
163+
builder.AddColumn("F", NumberType.I4, GenerateHelper(rowCount, 0.8, rgen, () => (Int32)rgen.Next()));
164164

165165
IDataView view = builder.GetDataView();
166166

@@ -181,11 +181,11 @@ public void TransposerTest()
181181
}
182182
// Check the contents
183183
Assert.Null(trans.TransposeSchema.GetSlotType(2)); // C check to see that it's not transposable.
184-
TransposeCheckHelper<DvInt4>(view, 0, trans); // A check.
184+
TransposeCheckHelper<Int32>(view, 0, trans); // A check.
185185
TransposeCheckHelper<Double>(view, 1, trans); // B check.
186186
TransposeCheckHelper<Double>(view, 3, trans); // D check.
187187
TransposeCheckHelper<uint>(view, 4, trans); // E check.
188-
TransposeCheckHelper<DvInt4>(view, 5, trans); // F check.
188+
TransposeCheckHelper<Int32>(view, 5, trans); // F check.
189189
}
190190

191191
// Force save. Recheck columns that would have previously been passthrough columns.
@@ -200,7 +200,7 @@ public void TransposerTest()
200200
Assert.Null(trans.TransposeSchema.GetSlotType(2));
201201
TransposeCheckHelper<Double>(view, 3, trans); // D check.
202202
TransposeCheckHelper<uint>(view, 4, trans); // E check.
203-
TransposeCheckHelper<DvInt4>(view, 5, trans); // F check.
203+
TransposeCheckHelper<Int32>(view, 5, trans); // F check.
204204
}
205205
}
206206

@@ -213,19 +213,19 @@ public void TransposerSaverLoaderTest()
213213
ArrayDataViewBuilder builder = new ArrayDataViewBuilder(Env);
214214

215215
// A is to check the splitting of a sparse-ish column.
216-
var dataA = GenerateHelper(rowCount, 0.1, rgen, () => (DvInt4)rgen.Next(), 50, 5, 10, 15);
217-
dataA[rowCount / 2] = new VBuffer<DvInt4>(50, 0, null, null); // Coverage for the null vbuffer case.
216+
var dataA = GenerateHelper(rowCount, 0.1, rgen, () => (Int32)rgen.Next(), 50, 5, 10, 15);
217+
dataA[rowCount / 2] = new VBuffer<Int32>(50, 0, null, null); // Coverage for the null vbuffer case.
218218
builder.AddColumn("A", NumberType.I4, dataA);
219219
// B is to check the splitting of a dense-ish column.
220220
builder.AddColumn("B", NumberType.R8, GenerateHelper(rowCount, 0.8, rgen, rgen.NextDouble, 50, 0, 25, 49));
221221
// C is to just have some column we do nothing with.
222-
builder.AddColumn("C", NumberType.I2, GenerateHelper(rowCount, 0.1, rgen, () => (DvInt2)1, 30, 3, 10, 24));
222+
builder.AddColumn("C", NumberType.I2, GenerateHelper(rowCount, 0.1, rgen, () => (Int16)1, 30, 3, 10, 24));
223223
// D is to check some column we don't have to split because it's sufficiently small.
224224
builder.AddColumn("D", NumberType.R8, GenerateHelper(rowCount, 0.1, rgen, rgen.NextDouble, 3, 1));
225225
// E is to check a sparse scalar column.
226226
builder.AddColumn("E", NumberType.U4, GenerateHelper(rowCount, 0.1, rgen, () => (uint)rgen.Next(int.MinValue, int.MaxValue)));
227227
// F is to check a dense-ish scalar column.
228-
builder.AddColumn("F", NumberType.I4, GenerateHelper(rowCount, 0.8, rgen, () => (DvInt4)rgen.Next()));
228+
builder.AddColumn("F", NumberType.I4, GenerateHelper(rowCount, 0.8, rgen, () => (Int32)rgen.Next()));
229229

230230
IDataView view = builder.GetDataView();
231231

@@ -240,12 +240,12 @@ public void TransposerSaverLoaderTest()
240240
// First check whether this as an IDataView yields the same values.
241241
CheckSameValues(view, loader);
242242

243-
TransposeCheckHelper<DvInt4>(view, 0, loader); // A
243+
TransposeCheckHelper<Int32>(view, 0, loader); // A
244244
TransposeCheckHelper<Double>(view, 1, loader); // B
245-
TransposeCheckHelper<DvInt2>(view, 2, loader); // C
245+
TransposeCheckHelper<Int16>(view, 2, loader); // C
246246
TransposeCheckHelper<Double>(view, 3, loader); // D
247247
TransposeCheckHelper<uint>(view, 4, loader); // E
248-
TransposeCheckHelper<DvInt4>(view, 5, loader); // F
248+
TransposeCheckHelper<Int32>(view, 5, loader); // F
249249

250250
Done();
251251
}

‎test/Microsoft.ML.TestFramework/DataPipe/TestDataPipeBase.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -879,19 +879,19 @@ protected Func<bool> GetColumnComparer(IRow r1, IRow r2, int col, ColumnType typ
879879
switch (type.RawKind)
880880
{
881881
case DataKind.I1:
882-
return GetComparerOne<DvInt1>(r1, r2, col, (x, y) => x.RawValue == y.RawValue);
882+
return GetComparerOne<SByte>(r1, r2, col, (x, y) => x == y);
883883
case DataKind.U1:
884884
return GetComparerOne<byte>(r1, r2, col, (x, y) => x == y);
885885
case DataKind.I2:
886-
return GetComparerOne<DvInt2>(r1, r2, col, (x, y) => x.RawValue == y.RawValue);
886+
return GetComparerOne<Int16>(r1, r2, col, (x, y) => x == y);
887887
case DataKind.U2:
888888
return GetComparerOne<ushort>(r1, r2, col, (x, y) => x == y);
889889
case DataKind.I4:
890-
return GetComparerOne<DvInt4>(r1, r2, col, (x, y) => x.RawValue == y.RawValue);
890+
return GetComparerOne<Int32>(r1, r2, col, (x, y) => x == y);
891891
case DataKind.U4:
892892
return GetComparerOne<uint>(r1, r2, col, (x, y) => x == y);
893893
case DataKind.I8:
894-
return GetComparerOne<DvInt8>(r1, r2, col, (x, y) => x.RawValue == y.RawValue);
894+
return GetComparerOne<Int64>(r1, r2, col, (x, y) => x == y);
895895
case DataKind.U8:
896896
return GetComparerOne<ulong>(r1, r2, col, (x, y) => x == y);
897897
case DataKind.R4:
@@ -922,19 +922,19 @@ protected Func<bool> GetColumnComparer(IRow r1, IRow r2, int col, ColumnType typ
922922
switch (type.ItemType.RawKind)
923923
{
924924
case DataKind.I1:
925-
return GetComparerVec<DvInt1>(r1, r2, col, size, (x, y) => x.RawValue == y.RawValue);
925+
return GetComparerVec<SByte>(r1, r2, col, size, (x, y) => x == y);
926926
case DataKind.U1:
927927
return GetComparerVec<byte>(r1, r2, col, size, (x, y) => x == y);
928928
case DataKind.I2:
929-
return GetComparerVec<DvInt2>(r1, r2, col, size, (x, y) => x.RawValue == y.RawValue);
929+
return GetComparerVec<Int16>(r1, r2, col, size, (x, y) => x == y);
930930
case DataKind.U2:
931931
return GetComparerVec<ushort>(r1, r2, col, size, (x, y) => x == y);
932932
case DataKind.I4:
933-
return GetComparerVec<DvInt4>(r1, r2, col, size, (x, y) => x.RawValue == y.RawValue);
933+
return GetComparerVec<Int32>(r1, r2, col, size, (x, y) => x == y);
934934
case DataKind.U4:
935935
return GetComparerVec<uint>(r1, r2, col, size, (x, y) => x == y);
936936
case DataKind.I8:
937-
return GetComparerVec<DvInt8>(r1, r2, col, size, (x, y) => x.RawValue == y.RawValue);
937+
return GetComparerVec<Int64>(r1, r2, col, size, (x, y) => x == y);
938938
case DataKind.U8:
939939
return GetComparerVec<ulong>(r1, r2, col, size, (x, y) => x == y);
940940
case DataKind.R4:

‎test/Microsoft.ML.TestFramework/TestSparseDataView.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
using Microsoft.ML.Runtime.Api;
66
using Microsoft.ML.Runtime.Data;
7+
using System;
78
using Xunit;
89
using Xunit.Abstractions;
910

@@ -34,7 +35,7 @@ private class SparseExample<T>
3435
public void SparseDataView()
3536
{
3637
GenericSparseDataView(new[] { 1f, 2f, 3f }, new[] { 1f, 10f, 100f });
37-
GenericSparseDataView(new DvInt4[] { 1, 2, 3 }, new DvInt4[] { 1, 10, 100 });
38+
GenericSparseDataView(new Int32[] { 1, 2, 3 }, new Int32[] { 1, 10, 100 });
3839
GenericSparseDataView(new DvBool[] { true, true, true }, new DvBool[] { false, false, false });
3940
GenericSparseDataView(new double[] { 1, 2, 3 }, new double[] { 1, 10, 100 });
4041
GenericSparseDataView(new DvText[] { new DvText("a"), new DvText("b"), new DvText("c") },
@@ -76,7 +77,7 @@ private void GenericSparseDataView<T>(T[] v1, T[] v2)
7677
public void DenseDataView()
7778
{
7879
GenericDenseDataView(new[] { 1f, 2f, 3f }, new[] { 1f, 10f, 100f });
79-
GenericDenseDataView(new DvInt4[] { 1, 2, 3 }, new DvInt4[] { 1, 10, 100 });
80+
GenericDenseDataView(new Int32[] { 1, 2, 3 }, new Int32[] { 1, 10, 100 });
8081
GenericDenseDataView(new DvBool[] { true, true, true }, new DvBool[] { false, false, false });
8182
GenericDenseDataView(new double[] { 1, 2, 3 }, new double[] { 1, 10, 100 });
8283
GenericDenseDataView(new DvText[] { new DvText("a"), new DvText("b"), new DvText("c") },

0 commit comments

Comments
 (0)