From ad85fbb1d29f60eed0e45ae567357a8f64ce638e Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Thu, 9 Dec 2021 21:50:21 +0100 Subject: [PATCH] Release MKL Provider 2.6.0-beta2 --- RELEASENOTES-MKL.md | 2 +- build.fsx | 14 ++++++++++++-- build/MathNet.Numerics.CUDA.Win.nuspec | 3 --- build/MathNet.Numerics.MKL.Linux-x64.nuspec | 4 +--- build/MathNet.Numerics.MKL.Linux-x86.nuspec | 4 +--- build/MathNet.Numerics.MKL.Linux.nuspec | 4 +--- build/MathNet.Numerics.MKL.Win-x64.nuspec | 4 +--- build/MathNet.Numerics.MKL.Win-x86.nuspec | 4 +--- build/MathNet.Numerics.MKL.Win.nuspec | 4 +--- build/MathNet.Numerics.OpenBLAS.Win.nuspec | 4 +--- 10 files changed, 20 insertions(+), 27 deletions(-) diff --git a/RELEASENOTES-MKL.md b/RELEASENOTES-MKL.md index 9d36a5b5..8c443263 100644 --- a/RELEASENOTES-MKL.md +++ b/RELEASENOTES-MKL.md @@ -1,4 +1,4 @@ -### 2.6.0-beta1 - 2021-12-09 +### 2.6.0-beta2 - 2021-12-09 * r15 with Intel oneAPI 2021.4, preview for Numerics v5 with MathNet.Numerics.Pro * Note that MathNet.Numerics.Providers.MKL.dll is required for this to work with Numerics v5 diff --git a/build.fsx b/build.fsx index 4dca2788..88e6eff1 100644 --- a/build.fsx +++ b/build.fsx @@ -133,6 +133,7 @@ type Solution = type NuGetSpecification = { NuGet: NuGetPackage NuSpecFile: string + Dependencies: (string * string) list Title: string } @@ -384,11 +385,12 @@ let zip (package:ZipPackage) zipDir filesDir filesFilter = // NUGET -let updateNuspec (nuget:NuGetPackage) outPath (spec:NuGet.NuGet.NuGetParams) = +let updateNuspec (nuget:NuGetPackage) outPath dependencies (spec:NuGet.NuGet.NuGetParams) = { spec with ToolPath = "packages/build/NuGet.CommandLine/tools/NuGet.exe" OutputPath = outPath WorkingDir = "obj/NuGet" Version = nuget.Release.PackageVersion + Dependencies = dependencies ReleaseNotes = nuget.Release.ReleaseNotes Publish = false } @@ -397,7 +399,7 @@ let nugetPackManually (solution:Solution) (packages:NuGetSpecification list) = for pack in packages do provideLicense "obj/NuGet" provideReadme (sprintf "%s v%s" pack.Title pack.NuGet.Release.PackageVersion) pack.NuGet.Release "obj/NuGet" - NuGet.NuGet (updateNuspec pack.NuGet solution.OutputNuGetDir) pack.NuSpecFile + NuGet.NuGet (updateNuspec pack.NuGet solution.OutputNuGetDir pack.Dependencies) pack.NuSpecFile Shell.cleanDir "obj/NuGet" Directory.delete "obj/NuGet" @@ -581,31 +583,37 @@ let mklSolution = solution "MKL" "MathNet.Numerics.MKL.sln" [mklWinProject; mklL let mklWinPack = { NuGet = mklWinNuGetPackage NuSpecFile = "build/MathNet.Numerics.MKL.Win.nuspec" + Dependencies = [ numericsProvidersMklNuGetPackage.Id, numericsProvidersMklNuGetPackage.Release.PackageVersion ] Title = "Math.NET Numerics - MKL Native Provider for Windows (x64 and x86)" } let mklWin32Pack = { NuGet = mklWin32NuGetPackage NuSpecFile = "build/MathNet.Numerics.MKL.Win-x86.nuspec" + Dependencies = [ numericsProvidersMklNuGetPackage.Id, numericsProvidersMklNuGetPackage.Release.PackageVersion ] Title = "Math.NET Numerics - MKL Native Provider for Windows (x86)" } let mklWin64Pack = { NuGet = mklWin64NuGetPackage NuSpecFile = "build/MathNet.Numerics.MKL.Win-x64.nuspec" + Dependencies = [ numericsProvidersMklNuGetPackage.Id, numericsProvidersMklNuGetPackage.Release.PackageVersion ] Title = "Math.NET Numerics - MKL Native Provider for Windows (x64)" } let mklLinuxPack = { NuGet = mklLinuxNuGetPackage NuSpecFile = "build/MathNet.Numerics.MKL.Linux.nuspec" + Dependencies = [ numericsProvidersMklNuGetPackage.Id, numericsProvidersMklNuGetPackage.Release.PackageVersion ] Title = "Math.NET Numerics - MKL Native Provider for Linux (x64 and x86)" } let mklLinux32Pack = { NuGet = mklLinux32NuGetPackage NuSpecFile = "build/MathNet.Numerics.MKL.Linux-x86.nuspec" + Dependencies = [ numericsProvidersMklNuGetPackage.Id, numericsProvidersMklNuGetPackage.Release.PackageVersion ] Title = "Math.NET Numerics - MKL Native Provider for Linux (x86)" } let mklLinux64Pack = { NuGet = mklLinux64NuGetPackage NuSpecFile = "build/MathNet.Numerics.MKL.Linux-x64.nuspec" + Dependencies = [ numericsProvidersMklNuGetPackage.Id, numericsProvidersMklNuGetPackage.Release.PackageVersion ] Title = "Math.NET Numerics - MKL Native Provider for Linux (x64)" } @@ -620,6 +628,7 @@ let cudaSolution = solution "CUDA" "MathNet.Numerics.CUDA.sln" [cudaWinProject] let cudaWinPack = { NuGet = cudaWinNuGetPackage NuSpecFile = "build/MathNet.Numerics.CUDA.Win.nuspec" + Dependencies = [ numericsProvidersCudaNuGetPackage.Id, numericsProvidersCudaNuGetPackage.Release.PackageVersion ] Title = "Math.NET Numerics - CUDA Native Provider for Windows (x64)" } @@ -634,6 +643,7 @@ let openBlasSolution = solution "OpenBLAS" "MathNet.Numerics.OpenBLAS.sln" [open let openBlasWinPack = { NuGet = openBlasWinNuGetPackage NuSpecFile = "build/MathNet.Numerics.OpenBLAS.Win.nuspec" + Dependencies = [ numericsProvidersOpenBlasNuGetPackage.Id, numericsProvidersOpenBlasNuGetPackage.Release.PackageVersion ] Title = "Math.NET Numerics - OpenBLAS Native Provider for Windows (x64 and x86)" } diff --git a/build/MathNet.Numerics.CUDA.Win.nuspec b/build/MathNet.Numerics.CUDA.Win.nuspec index b371df20..18c297df 100644 --- a/build/MathNet.Numerics.CUDA.Win.nuspec +++ b/build/MathNet.Numerics.CUDA.Win.nuspec @@ -15,9 +15,6 @@ Nvidia CUDA native libraries for Math.NET Numerics. @releaseNotes@ math numeric statistics probability integration interpolation linear algebra matrix fft native cuda gpu - - - diff --git a/build/MathNet.Numerics.MKL.Linux-x64.nuspec b/build/MathNet.Numerics.MKL.Linux-x64.nuspec index 48ab4570..84a95856 100644 --- a/build/MathNet.Numerics.MKL.Linux-x64.nuspec +++ b/build/MathNet.Numerics.MKL.Linux-x64.nuspec @@ -15,9 +15,7 @@ Intel MKL native libraries for Math.NET Numerics on Linux. @releaseNotes@ math numeric statistics probability integration interpolation linear algebra matrix fft native mkl - - - + @dependencies@ diff --git a/build/MathNet.Numerics.MKL.Linux-x86.nuspec b/build/MathNet.Numerics.MKL.Linux-x86.nuspec index 68f9a8dc..35125b42 100644 --- a/build/MathNet.Numerics.MKL.Linux-x86.nuspec +++ b/build/MathNet.Numerics.MKL.Linux-x86.nuspec @@ -15,9 +15,7 @@ Intel MKL native libraries for Math.NET Numerics on Linux. @releaseNotes@ math numeric statistics probability integration interpolation linear algebra matrix fft native mkl - - - + @dependencies@ diff --git a/build/MathNet.Numerics.MKL.Linux.nuspec b/build/MathNet.Numerics.MKL.Linux.nuspec index 04bd9c1c..3d70dfd1 100644 --- a/build/MathNet.Numerics.MKL.Linux.nuspec +++ b/build/MathNet.Numerics.MKL.Linux.nuspec @@ -15,9 +15,7 @@ Intel MKL native libraries for Math.NET Numerics on Linux. @releaseNotes@ math numeric statistics probability integration interpolation linear algebra matrix fft native mkl - - - + @dependencies@ diff --git a/build/MathNet.Numerics.MKL.Win-x64.nuspec b/build/MathNet.Numerics.MKL.Win-x64.nuspec index 78c9eca0..6e51aa84 100644 --- a/build/MathNet.Numerics.MKL.Win-x64.nuspec +++ b/build/MathNet.Numerics.MKL.Win-x64.nuspec @@ -15,9 +15,7 @@ Intel oneAPI MKL native libraries for Math.NET Numerics on Windows. @releaseNotes@ math numeric statistics probability integration interpolation linear algebra matrix fft native mkl - - - + @dependencies@ diff --git a/build/MathNet.Numerics.MKL.Win-x86.nuspec b/build/MathNet.Numerics.MKL.Win-x86.nuspec index 2eab5301..86158e0f 100644 --- a/build/MathNet.Numerics.MKL.Win-x86.nuspec +++ b/build/MathNet.Numerics.MKL.Win-x86.nuspec @@ -15,9 +15,7 @@ Intel oneAPI MKL native libraries for Math.NET Numerics on Windows. @releaseNotes@ math numeric statistics probability integration interpolation linear algebra matrix fft native mkl - - - + @dependencies@ diff --git a/build/MathNet.Numerics.MKL.Win.nuspec b/build/MathNet.Numerics.MKL.Win.nuspec index 2c23a3ad..b2c9f3e7 100644 --- a/build/MathNet.Numerics.MKL.Win.nuspec +++ b/build/MathNet.Numerics.MKL.Win.nuspec @@ -15,9 +15,7 @@ Intel oneAPI MKL native libraries for Math.NET Numerics on Windows. @releaseNotes@ math numeric statistics probability integration interpolation linear algebra matrix fft native mkl - - - + @dependencies@ diff --git a/build/MathNet.Numerics.OpenBLAS.Win.nuspec b/build/MathNet.Numerics.OpenBLAS.Win.nuspec index 73dd194b..26d225e3 100644 --- a/build/MathNet.Numerics.OpenBLAS.Win.nuspec +++ b/build/MathNet.Numerics.OpenBLAS.Win.nuspec @@ -15,9 +15,7 @@ OpenBLAS native libraries for Math.NET Numerics. @releaseNotes@ math numeric statistics probability integration interpolation linear algebra matrix fft native openblas - - - + @dependencies@