From e406b150626890aa43a8f57a7b0094bff383ebef Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Thu, 1 Jul 2021 14:27:18 -0600 Subject: [PATCH 1/7] New version of Intel MKL. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index fcbcfcd9ac..15c7095549 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,7 +22,7 @@ 2.3.1 2.1.0 1.6.0 - 0.0.0.9 + 0.0.0.10 2.1.3 4.5.0 4.5.0 From 520a97f4f51903b43842b188a64e34215fa7275c Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Thu, 1 Jul 2021 14:31:38 -0600 Subject: [PATCH 2/7] Docs updated. --- docs/building/MlNetMklDeps/MlNetMklDeps.nuspec | 2 +- docs/building/MlNetMklDeps/version.md | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec b/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec index b6d16f8497..052795bbd4 100644 --- a/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec +++ b/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec @@ -2,7 +2,7 @@ MlNetMklDeps - 0.0.0.9 + 0.0.0.10 This NuGet package provides Intel(R) MKL dependencies for ML.NET Intel Corporation Microsoft diff --git a/docs/building/MlNetMklDeps/version.md b/docs/building/MlNetMklDeps/version.md index 8b62cd44cf..377ea946d3 100644 --- a/docs/building/MlNetMklDeps/version.md +++ b/docs/building/MlNetMklDeps/version.md @@ -13,4 +13,7 @@ windows: 2018.3.210 mkl 2019 Update 2 mac:2019.2.187 linux:2019.2.187 -windows:2019.2.187 \ No newline at end of file +windows:2019.2.187 + +#Intel MKl SDK versions used to build the MlNetMklDeps v0.0.0.10 +mkl 2021.3 \ No newline at end of file From 2e4aa8589f4785ac264144596fced7e5819923b2 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Thu, 1 Jul 2021 15:58:25 -0600 Subject: [PATCH 3/7] Version --- docs/building/MlNetMklDeps/MlNetMklDeps.nuspec | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec b/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec index 052795bbd4..072c4db461 100644 --- a/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec +++ b/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec @@ -2,7 +2,7 @@ MlNetMklDeps - 0.0.0.10 + 0.0.0.11 This NuGet package provides Intel(R) MKL dependencies for ML.NET Intel Corporation Microsoft diff --git a/eng/Versions.props b/eng/Versions.props index 15c7095549..9706dbe190 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,7 +22,7 @@ 2.3.1 2.1.0 1.6.0 - 0.0.0.10 + 0.0.0.11 2.1.3 4.5.0 4.5.0 From eac59bf44cb05ea1f7f792944993e4632d9768a3 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Tue, 6 Jul 2021 19:24:21 -0600 Subject: [PATCH 4/7] symbols fix. --- eng/Versions.props | 2 +- src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj | 2 ++ src/Native/Native.proj | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9706dbe190..34dc4418a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,7 +22,7 @@ 2.3.1 2.1.0 1.6.0 - 0.0.0.11 + 0.0.0.12 2.1.3 4.5.0 4.5.0 diff --git a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj index 63f12a1b2d..8f752fe1a4 100644 --- a/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj +++ b/src/Microsoft.ML.Mkl.Redist/Microsoft.ML.Mkl.Redist.csproj @@ -23,6 +23,8 @@ + + \ No newline at end of file diff --git a/src/Native/Native.proj b/src/Native/Native.proj index 4955604c9c..1a92fcaa0c 100644 --- a/src/Native/Native.proj +++ b/src/Native/Native.proj @@ -86,6 +86,10 @@ SourceFiles="$(NuGetPackageRoot)mlnetmkldeps\$(MlNetMklDepsPackageVersion)\runtimes\$(PackageRid)\native\$(NativeLibPrefix)MklImports$(NativeLibExtension)" DestinationFolder="$(NativeAssetsBuiltPath)" /> + + + @@ -121,6 +125,9 @@ + From e570d711d6e68931453fd720c6a4a031e06e4496 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Tue, 6 Jul 2021 20:21:37 -0600 Subject: [PATCH 5/7] FIx for non-windows builds. --- src/Native/Native.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Native/Native.proj b/src/Native/Native.proj index 1a92fcaa0c..9544812378 100644 --- a/src/Native/Native.proj +++ b/src/Native/Native.proj @@ -125,7 +125,7 @@ - Date: Wed, 7 Jul 2021 09:28:50 -0600 Subject: [PATCH 6/7] Fixed versions in files. --- docs/building/MlNetMklDeps/MlNetMklDeps.nuspec | 2 +- docs/building/MlNetMklDeps/version.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec b/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec index 072c4db461..d20d004942 100644 --- a/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec +++ b/docs/building/MlNetMklDeps/MlNetMklDeps.nuspec @@ -2,7 +2,7 @@ MlNetMklDeps - 0.0.0.11 + 0.0.0.12 This NuGet package provides Intel(R) MKL dependencies for ML.NET Intel Corporation Microsoft diff --git a/docs/building/MlNetMklDeps/version.md b/docs/building/MlNetMklDeps/version.md index 377ea946d3..b181725284 100644 --- a/docs/building/MlNetMklDeps/version.md +++ b/docs/building/MlNetMklDeps/version.md @@ -15,5 +15,5 @@ mac:2019.2.187 linux:2019.2.187 windows:2019.2.187 -#Intel MKl SDK versions used to build the MlNetMklDeps v0.0.0.10 +#Intel MKl SDK versions used to build the MlNetMklDeps v0.0.0.12 mkl 2021.3 \ No newline at end of file From 97c5d06a73f24b94a38eac8265a0719d1b96c274 Mon Sep 17 00:00:00 2001 From: Michael Sharp Date: Wed, 7 Jul 2021 10:23:30 -0600 Subject: [PATCH 7/7] Comments from PR changes. --- src/Native/Native.proj | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Native/Native.proj b/src/Native/Native.proj index 9544812378..54dc0e7b89 100644 --- a/src/Native/Native.proj +++ b/src/Native/Native.proj @@ -35,6 +35,10 @@ $(IntermediateOutputPath)_version.h + + true + + lib .dll @@ -87,10 +91,10 @@ DestinationFolder="$(NativeAssetsBuiltPath)" /> - - @@ -125,10 +129,10 @@ - -