Release MKL Provider 3.0.0

mathnet · Apr 3, 2022 · ab1ac92 · ab1ac92
1 parent 4435308
commit ab1ac92
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 20 deletions.
diff --git a/RELEASENOTES-MKL.md b/RELEASENOTES-MKL.md
@@ -1,3 +1,8 @@
+### 3.0.0 - 2022-02-19
+* New binary names and package structure with runtime folders
+* With Intel oneAPI 2022
+* Note that MathNet.Numerics.Providers.MKL.dll is required for this to work with Numerics v5
+
 ### 3.0.0-beta3 - 2022-02-19
 * Fix typo in the binary file name
 

diff --git a/build/MathNet.Numerics.MKL.Linux-x64.nuspec b/build/MathNet.Numerics.MKL.Linux-x64.nuspec
@@ -29,6 +29,6 @@
         <file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
         <file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
         <file src="..\..\build\icon.png" target="icon.png" />
-        <file src="..\..\LICENSE-MKL.md" target="license.txt" />
+        <file src="license.txt" target="license.txt" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Linux-x86.nuspec b/build/MathNet.Numerics.MKL.Linux-x86.nuspec
@@ -29,6 +29,6 @@
         <file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
         <file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
         <file src="..\..\build\icon.png" target="icon.png" />
-        <file src="..\..\LICENSE-MKL.md" target="license.txt" />
+        <file src="license.txt" target="license.txt" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Linux.nuspec b/build/MathNet.Numerics.MKL.Linux.nuspec
@@ -31,6 +31,6 @@
         <file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
         <file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
         <file src="..\..\build\icon.png" target="icon.png" />
-        <file src="..\..\LICENSE-MKL.md" target="license.txt" />
+        <file src="license.txt" target="license.txt" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Win-x64.nuspec b/build/MathNet.Numerics.MKL.Win-x64.nuspec
@@ -29,6 +29,6 @@
         <file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
         <file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
         <file src="..\..\build\icon.png" target="icon.png" />
-        <file src="..\..\LICENSE-MKL.md" target="license.txt" />
+        <file src="license.txt" target="license.txt" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Win-x86.nuspec b/build/MathNet.Numerics.MKL.Win-x86.nuspec
@@ -29,6 +29,6 @@
         <file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
         <file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
         <file src="..\..\build\icon.png" target="icon.png" />
-        <file src="..\..\LICENSE-MKL.md" target="license.txt" />
+        <file src="license.txt" target="license.txt" />
     </files>
 </package>
diff --git a/build/MathNet.Numerics.MKL.Win.nuspec b/build/MathNet.Numerics.MKL.Win.nuspec
@@ -31,6 +31,6 @@
         <file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
         <file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
         <file src="..\..\build\icon.png" target="icon.png" />
-        <file src="..\..\LICENSE-MKL.md" target="license.txt" />
+        <file src="license.txt" target="license.txt" />
     </files>
 </package>
diff --git a/build/Packaging.fs b/build/Packaging.fs
@@ -26,8 +26,8 @@ let collectNuGetPackages (solution:Solution) =
         | VisualStudio project -> Shell.copyDir solution.OutputNuGetDir project.OutputDir (fun n -> n.EndsWith(".nupkg"))
         | _ -> failwith "Project type not supported")
 
-let provideLicense path =
-    File.readAsString "LICENSE.md"
+let provideLicense licenseFile path =
+    File.readAsString licenseFile
     |> String.convertTextToWindowsLineBreaks
     |> File.replaceContent (path </> "license.txt")
 
@@ -72,7 +72,7 @@ let zip (package:ZipPackage) header zipDir filesDir filesFilter =
     Shell.cleanDir "obj/Zip"
     let workPath = "obj/Zip/" + package.Id
     Shell.copyDir workPath filesDir filesFilter
-    provideLicense workPath
+    provideLicense "LICENSE.md" workPath
     provideReadme header (sprintf "%s v%s" package.Title package.Release.PackageVersion) package.Release workPath
     Zip.zip "obj/Zip/" (zipDir </> sprintf "%s-%s.zip" package.Id package.Release.PackageVersion) !! (workPath + "/**/*.*")
     Directory.delete "obj/Zip"
@@ -87,10 +87,10 @@ let private updateNuspec (nuget:NuGetPackage) outPath dependencies (spec:NuGet.N
                 ReleaseNotes = nuget.Release.ReleaseNotes
                 Publish = false }
 
-let nugetPackManually (solution:Solution) (packages:NuGetSpecification list) header =
+let nugetPackManually (solution:Solution) (packages:NuGetSpecification list) licenseFile header =
     Shell.cleanDir "obj/NuGet"
     for pack in packages do
-        provideLicense "obj/NuGet"
+        provideLicense licenseFile "obj/NuGet"
         provideReadme header (sprintf "%s v%s" pack.Title pack.NuGet.Release.PackageVersion) pack.NuGet.Release "obj/NuGet"
         NuGet.NuGet (updateNuspec pack.NuGet solution.OutputNuGetDir pack.Dependencies) pack.NuSpecFile
         Shell.cleanDir "obj/NuGet"

diff --git a/build/build.fs b/build/build.fs
@@ -225,7 +225,7 @@ let ``Build MKL Windows`` isIncremental isSign _ =
     Directory.create mklSolution.OutputZipDir
     zip mklWinZipPackage header mklSolution.OutputZipDir "out/MKL/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("libMathNetNumerics") || f.Contains("libiomp5md.dll"))
     Directory.create mklSolution.OutputNuGetDir
-    nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] header
+    nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] "LICENSE-MKL.md" header
 
     // NuGet Sign (all or nothing)
     if isSign then signNuGet fingerprint timeserver [mklSolution]
@@ -237,7 +237,7 @@ let ``Build CUDA Windows`` isIncremental isSign _ =
     Directory.create cudaSolution.OutputZipDir
     zip cudaWinZipPackage header cudaSolution.OutputZipDir "out/CUDA/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.CUDA.") || f.Contains("libMathNetNumerics") || f.Contains("cublas") || f.Contains("cudart") || f.Contains("cusolver"))
     Directory.create cudaSolution.OutputNuGetDir
-    nugetPackManually cudaSolution [ cudaWinPack ] header
+    nugetPackManually cudaSolution [ cudaWinPack ] "LICENSE.md" header
 
     // NuGet Sign (all or nothing)
     if isSign then signNuGet fingerprint timeserver [cudaSolution]
@@ -250,7 +250,7 @@ let ``Build OpenBLAS Windows`` isIncremental isSign _ =
     Directory.create openBlasSolution.OutputZipDir
     zip openBlasWinZipPackage header openBlasSolution.OutputZipDir "out/OpenBLAS/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.OpenBLAS.") || f.Contains("libMathNetNumerics") || f.Contains("libgcc") || f.Contains("libgfortran") || f.Contains("libopenblas") || f.Contains("libquadmath"))
     Directory.create openBlasSolution.OutputNuGetDir
-    nugetPackManually openBlasSolution [ openBlasWinPack ] header
+    nugetPackManually openBlasSolution [ openBlasWinPack ] "LICENSE.md" header
 
     // NuGet Sign (all or nothing)
     if isSign then signNuGet fingerprint timeserver [openBlasSolution]
@@ -268,19 +268,19 @@ let ``Pack MKL Linux Zip`` _ =
 
 let ``Pack MKL Linux NuGet`` _ =
     Directory.create mklSolution.OutputNuGetDir
-    nugetPackManually mklSolution [ mklLinuxPack; mklLinux32Pack; mklLinux64Pack ] header
+    nugetPackManually mklSolution [ mklLinuxPack; mklLinux32Pack; mklLinux64Pack ] "LICENSE-MKL.md" header
 
 let ``Pack MKL Windows`` _ =
     Directory.create mklSolution.OutputZipDir
     zip mklWinZipPackage header mklSolution.OutputZipDir "out/MKL/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("libMathNetNumerics") || f.Contains("libiomp5md.dll"))
     Directory.create mklSolution.OutputNuGetDir
-    nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] header
+    nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] "LICENSE-MKL.md" header
 
 let ``Pack OpenBLAS Windows`` _ =
     Directory.create openBlasSolution.OutputZipDir
     zip openBlasWinZipPackage header openBlasSolution.OutputZipDir "out/OpenBLAS/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.OpenBLAS.") || f.Contains("libMathNetNumerics") || f.Contains("libgcc") || f.Contains("libgfortran") || f.Contains("libopenblas") || f.Contains("libquadmath"))
     Directory.create openBlasSolution.OutputNuGetDir
-    nugetPackManually openBlasSolution [ openBlasWinPack ] header
+    nugetPackManually openBlasSolution [ openBlasWinPack ] "LICENSE.md" header
 
 let extraDocs =
     [ "LICENSE.md", "License.md"

diff --git a/src/Numerics.Tests/DistributionTests/Multivariate/MatrixNormalTests.cs b/src/Numerics.Tests/DistributionTests/Multivariate/MatrixNormalTests.cs
@@ -250,7 +250,7 @@ public void ValidateDensity()
             x[0, 0] = 2;
             x[0, 1] = 2;
 
-            AssertHelpers.AlmostEqualRelative(0.00015682927366491211, d.Density(x), 16);
+            AssertHelpers.AlmostEqualRelative(0.00015682927366491211, d.Density(x), 13);
         }
 
         /// <summary>

diff --git a/src/Numerics.Tests/LinearAlgebraTests/Double/MatrixTests.Arithmetic.cs b/src/Numerics.Tests/LinearAlgebraTests/Double/MatrixTests.Arithmetic.cs
@@ -698,7 +698,7 @@ public void CanTransposeThisAndMultiplyMatrixWithMatrix(string nameA)
             {
                 for (var j = 0; j < matrixC.ColumnCount; j++)
                 {
-                    AssertHelpers.AlmostEqual(matrixA.Column(i)*matrixB.Column(j), matrixC[i, j], 15);
+                    AssertHelpers.AlmostEqual(matrixA.Column(i)*matrixB.Column(j), matrixC[i, j], 13);
                 }
             }
         }
@@ -736,7 +736,7 @@ public void CanTransposeThisAndMultiplyMatrixWithMatrixIntoResult(string nameA)
             {
                 for (var j = 0; j < matrixC.ColumnCount; j++)
                 {
-                    AssertHelpers.AlmostEqual(matrixA.Column(i)*matrixB.Column(j), matrixC[i, j], 15);
+                    AssertHelpers.AlmostEqual(matrixA.Column(i)*matrixB.Column(j), matrixC[i, j], 13);
                 }
             }
         }