Skip to content

Commit c3730a0

Browse files
committed
Add reference to MKL nuget.
1 parent 200ac53 commit c3730a0

File tree

5 files changed

+23
-14
lines changed

5 files changed

+23
-14
lines changed

src/Microsoft.ML/Microsoft.ML.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10+
<PackageReference Include="MlNetMklDeps" Version="0.0.0.1" />
1011
<PackageReference Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
1112
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
1213
</ItemGroup>

src/Native/SymSgdNative/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ set(SOURCES
55
)
66

77
if(WIN32)
8-
link_directories(${CMAKE_SOURCE_DIR}/../../packages/MlNetMklDeps/runtimes/win-x64/native)
8+
link_directories(${CMAKE_SOURCE_DIR}/../../packages/MlNetMklDeps/0.0.0.1/runtimes/win-x64/native)
99
else()
1010
list(APPEND SOURCES ${VERSION_FILE_PATH})
1111
if(APPLE)
12-
link_directories(${CMAKE_SOURCE_DIR}/../../packages/MlNetMklDeps/runtimes/osx-x64/native)
12+
link_directories(${CMAKE_SOURCE_DIR}/../../packages/MlNetMklDeps/0.0.0.1/runtimes/osx-x64/native)
1313
else()
14-
link_directories(${CMAKE_SOURCE_DIR}/../../packages/MlNetMklDeps/runtimes/linux-x64/native)
14+
link_directories(${CMAKE_SOURCE_DIR}/../../packages/MlNetMklDeps/0.0.0.1/runtimes/linux-x64/native)
1515
endif()
1616
endif()
1717

test/Microsoft.ML.Predictor.Tests/Microsoft.ML.Predictor.Tests.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@
3030
<NativeAssemblyReference Include="SymSgdNative" />
3131
</ItemGroup>
3232

33+
<ItemGroup>
34+
<PackageReference Include="MlNetMklDeps" Version="0.0.0.1" />
35+
</ItemGroup>
36+
3337
</Project>

test/Microsoft.ML.Tests/Microsoft.ML.Tests.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,8 @@
2323
<NativeAssemblyReference Include="LdaNative" />
2424
<NativeAssemblyReference Include="SymSgdNative" />
2525
</ItemGroup>
26+
27+
<ItemGroup>
28+
<PackageReference Include="MlNetMklDeps" Version="0.0.0.1" />
29+
</ItemGroup>
2630
</Project>

test/Microsoft.ML.Tests/Scenarios/SentimentPredictionTests.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,16 @@ public void CrossValidateSentimentModelTest()
190190
private void ValidateBinaryMetricsSymSGD(BinaryClassificationMetrics metrics)
191191
{
192192

193-
Assert.Equal(.9444, metrics.Accuracy, 4);
193+
Assert.Equal(.8889, metrics.Accuracy, 4);
194194
Assert.Equal(1, metrics.Auc, 1);
195-
Assert.Equal(1, metrics.Auprc, 2);
195+
Assert.Equal(0.96, metrics.Auprc, 2);
196196
Assert.Equal(1, metrics.Entropy, 3);
197-
Assert.Equal(.9474, metrics.F1Score, 4);
198-
Assert.Equal(.113, metrics.LogLoss, 3);
199-
Assert.Equal(88.722, metrics.LogLossReduction, 3);
197+
Assert.Equal(.9, metrics.F1Score, 4);
198+
Assert.Equal(.97, metrics.LogLoss, 3);
199+
Assert.Equal(3.030, metrics.LogLossReduction, 3);
200200
Assert.Equal(1, metrics.NegativePrecision, 3);
201-
Assert.Equal(.889, metrics.NegativeRecall, 3);
202-
Assert.Equal(.9, metrics.PositivePrecision, 3);
201+
Assert.Equal(.778, metrics.NegativeRecall, 3);
202+
Assert.Equal(.818, metrics.PositivePrecision, 3);
203203
Assert.Equal(1, metrics.PositiveRecall);
204204

205205
var matrix = metrics.ConfusionMatrix;
@@ -213,10 +213,10 @@ private void ValidateBinaryMetricsSymSGD(BinaryClassificationMetrics metrics)
213213
Assert.Equal(0, matrix[0, 1]);
214214
Assert.Equal(0, matrix["positive", "negative"]);
215215

216-
Assert.Equal(1, matrix[1, 0]);
217-
Assert.Equal(1, matrix["negative", "positive"]);
218-
Assert.Equal(8, matrix[1, 1]);
219-
Assert.Equal(8, matrix["negative", "negative"]);
216+
Assert.Equal(2, matrix[1, 0]);
217+
Assert.Equal(2, matrix["negative", "positive"]);
218+
Assert.Equal(7, matrix[1, 1]);
219+
Assert.Equal(7, matrix["negative", "negative"]);
220220

221221
}
222222

0 commit comments

Comments
 (0)