Skip to content

Commit ab1ac92

Browse files
cdrnetcdrnet
committed
Release MKL Provider 3.0.0
1 parent 4435308 commit ab1ac92

11 files changed

+25
-20
lines changed

‎RELEASENOTES-MKL.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### 3.0.0 - 2022-02-19
2+
* New binary names and package structure with runtime folders
3+
* With Intel oneAPI 2022
4+
* Note that MathNet.Numerics.Providers.MKL.dll is required for this to work with Numerics v5
5+
16
### 3.0.0-beta3 - 2022-02-19
27
* Fix typo in the binary file name
38

‎build/MathNet.Numerics.MKL.Linux-x64.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
<file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
3030
<file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
3131
<file src="..\..\build\icon.png" target="icon.png" />
32-
<file src="..\..\LICENSE-MKL.md" target="license.txt" />
32+
<file src="license.txt" target="license.txt" />
3333
</files>
3434
</package>

‎build/MathNet.Numerics.MKL.Linux-x86.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
<file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
3030
<file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
3131
<file src="..\..\build\icon.png" target="icon.png" />
32-
<file src="..\..\LICENSE-MKL.md" target="license.txt" />
32+
<file src="license.txt" target="license.txt" />
3333
</files>
3434
</package>

‎build/MathNet.Numerics.MKL.Linux.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
<file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
3232
<file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
3333
<file src="..\..\build\icon.png" target="icon.png" />
34-
<file src="..\..\LICENSE-MKL.md" target="license.txt" />
34+
<file src="license.txt" target="license.txt" />
3535
</files>
3636
</package>

‎build/MathNet.Numerics.MKL.Win-x64.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
<file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
3030
<file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
3131
<file src="..\..\build\icon.png" target="icon.png" />
32-
<file src="..\..\LICENSE-MKL.md" target="license.txt" />
32+
<file src="license.txt" target="license.txt" />
3333
</files>
3434
</package>

‎build/MathNet.Numerics.MKL.Win-x86.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@
2929
<file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
3030
<file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
3131
<file src="..\..\build\icon.png" target="icon.png" />
32-
<file src="..\..\LICENSE-MKL.md" target="license.txt" />
32+
<file src="license.txt" target="license.txt" />
3333
</files>
3434
</package>

‎build/MathNet.Numerics.MKL.Win.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
<file src="..\..\build\_._" target="buildTransitive\net5.0\_._" />
3232
<file src="..\..\build\_._" target="buildTransitive\netstandard2.0\_._" />
3333
<file src="..\..\build\icon.png" target="icon.png" />
34-
<file src="..\..\LICENSE-MKL.md" target="license.txt" />
34+
<file src="license.txt" target="license.txt" />
3535
</files>
3636
</package>

‎build/Packaging.fs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ let collectNuGetPackages (solution:Solution) =
2626
| VisualStudio project -> Shell.copyDir solution.OutputNuGetDir project.OutputDir (fun n -> n.EndsWith(".nupkg"))
2727
| _ -> failwith "Project type not supported")
2828

29-
let provideLicense path =
30-
File.readAsString "LICENSE.md"
29+
let provideLicense licenseFile path =
30+
File.readAsString licenseFile
3131
|> String.convertTextToWindowsLineBreaks
3232
|> File.replaceContent (path </> "license.txt")
3333

@@ -72,7 +72,7 @@ let zip (package:ZipPackage) header zipDir filesDir filesFilter =
7272
Shell.cleanDir "obj/Zip"
7373
let workPath = "obj/Zip/" + package.Id
7474
Shell.copyDir workPath filesDir filesFilter
75-
provideLicense workPath
75+
provideLicense "LICENSE.md" workPath
7676
provideReadme header (sprintf "%s v%s" package.Title package.Release.PackageVersion) package.Release workPath
7777
Zip.zip "obj/Zip/" (zipDir </> sprintf "%s-%s.zip" package.Id package.Release.PackageVersion) !! (workPath + "/**/*.*")
7878
Directory.delete "obj/Zip"
@@ -87,10 +87,10 @@ let private updateNuspec (nuget:NuGetPackage) outPath dependencies (spec:NuGet.N
8787
ReleaseNotes = nuget.Release.ReleaseNotes
8888
Publish = false }
8989

90-
let nugetPackManually (solution:Solution) (packages:NuGetSpecification list) header =
90+
let nugetPackManually (solution:Solution) (packages:NuGetSpecification list) licenseFile header =
9191
Shell.cleanDir "obj/NuGet"
9292
for pack in packages do
93-
provideLicense "obj/NuGet"
93+
provideLicense licenseFile "obj/NuGet"
9494
provideReadme header (sprintf "%s v%s" pack.Title pack.NuGet.Release.PackageVersion) pack.NuGet.Release "obj/NuGet"
9595
NuGet.NuGet (updateNuspec pack.NuGet solution.OutputNuGetDir pack.Dependencies) pack.NuSpecFile
9696
Shell.cleanDir "obj/NuGet"

‎build/build.fs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ let ``Build MKL Windows`` isIncremental isSign _ =
225225
Directory.create mklSolution.OutputZipDir
226226
zip mklWinZipPackage header mklSolution.OutputZipDir "out/MKL/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("libMathNetNumerics") || f.Contains("libiomp5md.dll"))
227227
Directory.create mklSolution.OutputNuGetDir
228-
nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] header
228+
nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] "LICENSE-MKL.md" header
229229

230230
// NuGet Sign (all or nothing)
231231
if isSign then signNuGet fingerprint timeserver [mklSolution]
@@ -237,7 +237,7 @@ let ``Build CUDA Windows`` isIncremental isSign _ =
237237
Directory.create cudaSolution.OutputZipDir
238238
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"))
239239
Directory.create cudaSolution.OutputNuGetDir
240-
nugetPackManually cudaSolution [ cudaWinPack ] header
240+
nugetPackManually cudaSolution [ cudaWinPack ] "LICENSE.md" header
241241

242242
// NuGet Sign (all or nothing)
243243
if isSign then signNuGet fingerprint timeserver [cudaSolution]
@@ -250,7 +250,7 @@ let ``Build OpenBLAS Windows`` isIncremental isSign _ =
250250
Directory.create openBlasSolution.OutputZipDir
251251
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"))
252252
Directory.create openBlasSolution.OutputNuGetDir
253-
nugetPackManually openBlasSolution [ openBlasWinPack ] header
253+
nugetPackManually openBlasSolution [ openBlasWinPack ] "LICENSE.md" header
254254

255255
// NuGet Sign (all or nothing)
256256
if isSign then signNuGet fingerprint timeserver [openBlasSolution]
@@ -268,19 +268,19 @@ let ``Pack MKL Linux Zip`` _ =
268268

269269
let ``Pack MKL Linux NuGet`` _ =
270270
Directory.create mklSolution.OutputNuGetDir
271-
nugetPackManually mklSolution [ mklLinuxPack; mklLinux32Pack; mklLinux64Pack ] header
271+
nugetPackManually mklSolution [ mklLinuxPack; mklLinux32Pack; mklLinux64Pack ] "LICENSE-MKL.md" header
272272

273273
let ``Pack MKL Windows`` _ =
274274
Directory.create mklSolution.OutputZipDir
275275
zip mklWinZipPackage header mklSolution.OutputZipDir "out/MKL/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("libMathNetNumerics") || f.Contains("libiomp5md.dll"))
276276
Directory.create mklSolution.OutputNuGetDir
277-
nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] header
277+
nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] "LICENSE-MKL.md" header
278278

279279
let ``Pack OpenBLAS Windows`` _ =
280280
Directory.create openBlasSolution.OutputZipDir
281281
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"))
282282
Directory.create openBlasSolution.OutputNuGetDir
283-
nugetPackManually openBlasSolution [ openBlasWinPack ] header
283+
nugetPackManually openBlasSolution [ openBlasWinPack ] "LICENSE.md" header
284284

285285
let extraDocs =
286286
[ "LICENSE.md", "License.md"

‎src/Numerics.Tests/DistributionTests/Multivariate/MatrixNormalTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public void ValidateDensity()
250250
x[0, 0] = 2;
251251
x[0, 1] = 2;
252252

253-
AssertHelpers.AlmostEqualRelative(0.00015682927366491211, d.Density(x), 16);
253+
AssertHelpers.AlmostEqualRelative(0.00015682927366491211, d.Density(x), 13);
254254
}
255255

256256
/// <summary>

0 commit comments

Comments
 (0)