Skip to content

Commit 7f02942

Browse files
cdrnetcdrnet
committed
Release OpenBLAS Provider 0.3.0-beta1
1 parent c05c326 commit 7f02942

8 files changed

Lines changed: 59 additions & 14 deletions

File tree

‎RELEASENOTES-OpenBLAS.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
### 0.3.0-beta1 - 2022-02-21
2+
* New binary names and package structure with runtime folders
3+
14
### 0.2.0 - 2015-09-26
25
* Initial version

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<file src="..\..\out\OpenBLAS\Windows\x64\libgfortran-3.dll" target="runtimes\win-x64\native\libgfortran-3.dll" />
2323
<file src="..\..\out\OpenBLAS\Windows\x64\libopenblas.dll" target="runtimes\win-x64\native\libopenblas.dll" />
2424
<file src="..\..\out\OpenBLAS\Windows\x64\libquadmath-0.dll" target="runtimes\win-x64\native\libquadmath-0.dll" />
25-
<file src="..\..\out\OpenBLAS\Windows\x64\MathNet.Numerics.OpenBLAS.dll" target="runtimes\win-x64\native\MathNet.Numerics.OpenBLAS.dll" />
25+
<file src="..\..\out\OpenBLAS\Windows\x64\libMathNetNumericsOpenBLAS.dll" target="runtimes\win-x64\native\libMathNetNumericsOpenBLAS.dll" />
2626
<file src="..\..\out\OpenBLAS\Windows\x86\libgcc_s_sjlj-1.dll" target="runtimes\win-x86\native\libgcc_s_sjlj-1.dll" />
2727
<file src="..\..\out\OpenBLAS\Windows\x86\libgfortran-3.dll" target="runtimes\win-x86\native\libgfortran-3.dll" />
2828
<file src="..\..\out\OpenBLAS\Windows\x86\libopenblas.dll" target="runtimes\win-x86\native\libopenblas.dll" />

‎build/build.fs‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ let ``Build MKL Windows`` isIncremental isSign _ =
223223
buildVS2022x86 "Release-MKL" isIncremental !! "MathNet.Numerics.MKL.sln"
224224
buildVS2022x64 "Release-MKL" isIncremental !! "MathNet.Numerics.MKL.sln"
225225
Directory.create mklSolution.OutputZipDir
226-
zip mklWinZipPackage header mklSolution.OutputZipDir "out/MKL/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("MathNet.Numerics.MKL.") || f.Contains("libiomp5md.dll"))
226+
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
228228
nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] header
229229

@@ -235,7 +235,7 @@ let ``Build CUDA Windows`` isIncremental isSign _ =
235235
restore cudaSolution
236236
buildVS2022x64 "Release-CUDA" isIncremental !! "MathNet.Numerics.CUDA.sln"
237237
Directory.create cudaSolution.OutputZipDir
238-
zip cudaWinZipPackage header cudaSolution.OutputZipDir "out/CUDA/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.CUDA.") || f.Contains("MathNet.Numerics.CUDA.") || f.Contains("cublas") || f.Contains("cudart") || f.Contains("cusolver"))
238+
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
240240
nugetPackManually cudaSolution [ cudaWinPack ] header
241241

@@ -248,7 +248,7 @@ let ``Build OpenBLAS Windows`` isIncremental isSign _ =
248248
buildVS2022x86 "Release-OpenBLAS" isIncremental !! "MathNet.Numerics.OpenBLAS.sln"
249249
buildVS2022x64 "Release-OpenBLAS" isIncremental !! "MathNet.Numerics.OpenBLAS.sln"
250250
Directory.create openBlasSolution.OutputZipDir
251-
zip openBlasWinZipPackage header openBlasSolution.OutputZipDir "out/OpenBLAS/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.OpenBLAS.") || f.Contains("MathNet.Numerics.OpenBLAS.") || f.Contains("libgcc") || f.Contains("libgfortran") || f.Contains("libopenblas") || f.Contains("libquadmath"))
251+
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
253253
nugetPackManually openBlasSolution [ openBlasWinPack ] header
254254

@@ -264,12 +264,24 @@ let ``Test CUDA`` framework _ = test "src/Numerics.Tests" "Numerics.Tests.CUDA.c
264264

265265
let ``Pack MKL Linux Zip`` _ =
266266
Directory.create mklSolution.OutputZipDir
267-
zip mklLinuxZipPackage header mklSolution.OutputZipDir "out/MKL/Linux" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("MathNet.Numerics.MKL.") || f.Contains("libiomp5.so"))
267+
zip mklLinuxZipPackage header mklSolution.OutputZipDir "out/MKL/Linux" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("libMathNetNumerics") || f.Contains("libiomp5.so"))
268268

269269
let ``Pack MKL Linux NuGet`` _ =
270270
Directory.create mklSolution.OutputNuGetDir
271271
nugetPackManually mklSolution [ mklLinuxPack; mklLinux32Pack; mklLinux64Pack ] header
272272

273+
let ``Pack MKL Windows`` _ =
274+
Directory.create mklSolution.OutputZipDir
275+
zip mklWinZipPackage header mklSolution.OutputZipDir "out/MKL/Windows" (fun f -> f.Contains("MathNet.Numerics.Providers.MKL.") || f.Contains("libMathNetNumerics") || f.Contains("libiomp5md.dll"))
276+
Directory.create mklSolution.OutputNuGetDir
277+
nugetPackManually mklSolution [ mklWinPack; mklWin32Pack; mklWin64Pack ] header
278+
279+
let ``Pack OpenBLAS Windows`` _ =
280+
Directory.create openBlasSolution.OutputZipDir
281+
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"))
282+
Directory.create openBlasSolution.OutputNuGetDir
283+
nugetPackManually openBlasSolution [ openBlasWinPack ] header
284+
273285
let extraDocs =
274286
[ "LICENSE.md", "License.md"
275287
"CONTRIBUTING.md", "Contributing.md"
@@ -367,12 +379,14 @@ let initTargets strongname sign incremental =
367379
"CudaWinBuild" ==> "CudaTestNET50" ==> "CudaTest" |> ignore
368380
"CudaWinBuild" =?> ("CudaTestNET48", Environment.isWindows) ==> "CudaTest" |> ignore
369381

370-
// LINUX PACKAGES
382+
// PACKAGING ONLY WITHOUT BUILD
371383
Target.create "MklLinuxPack" ignore
372384
Target.create "MklLinuxZip" ``Pack MKL Linux Zip``
373385
"MklLinuxZip" ==> "MklLinuxPack" |> ignore
374386
Target.create "MklLinuxNuGet" ``Pack MKL Linux NuGet``
375387
"MklLinuxNuGet" ==> "MklLinuxPack" |> ignore
388+
Target.create "MklWinPack" ``Pack MKL Windows``
389+
Target.create "OpenBlasWinPack" ``Pack OpenBLAS Windows``
376390

377391
// DOCS
378392
Target.create "CleanDocs" ``Docs Clean``

‎build/build.sln‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.1.32210.238
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "build", "build.fsproj", "{F4109BC0-BEF8-4BD3-B828-B40A25D08F42}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{F4109BC0-BEF8-4BD3-B828-B40A25D08F42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{F4109BC0-BEF8-4BD3-B828-B40A25D08F42}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{F4109BC0-BEF8-4BD3-B828-B40A25D08F42}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{F4109BC0-BEF8-4BD3-B828-B40A25D08F42}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {0A21EDE9-321C-4AB2-B8DC-FF61A8D01D0A}
24+
EndGlobalSection
25+
EndGlobal

‎src/NativeProviders/Common/blas.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,29 +57,29 @@ DLLEXPORT blas_complex_double z_dot_product(const blas_int n, const blas_complex
5757
}
5858

5959
DLLEXPORT void s_matrix_multiply(CBLAS_TRANSPOSE transA, CBLAS_TRANSPOSE transB, const blas_int m, const blas_int n, const blas_int k, const float alpha, const float x[], const float y[], const float beta, float c[]){
60-
blas_int lda = transA == CblasNoTrans ? m : k;
61-
blas_int ldb = transB == CblasNoTrans ? k : n;
60+
const blas_int lda = transA == CblasNoTrans ? m : k;
61+
const blas_int ldb = transB == CblasNoTrans ? k : n;
6262

6363
cblas_sgemm(CblasColMajor, transA, transB, m, n, k, alpha, x, lda, y, ldb, beta, c, m);
6464
}
6565

6666
DLLEXPORT void d_matrix_multiply(CBLAS_TRANSPOSE transA, CBLAS_TRANSPOSE transB, const blas_int m, const blas_int n, const blas_int k, const double alpha, const double x[], const double y[], const double beta, double c[]){
67-
blas_int lda = transA == CblasNoTrans ? m : k;
68-
blas_int ldb = transB == CblasNoTrans ? k : n;
67+
const blas_int lda = transA == CblasNoTrans ? m : k;
68+
const blas_int ldb = transB == CblasNoTrans ? k : n;
6969

7070
cblas_dgemm(CblasColMajor, transA, transB, m, n, k, alpha, x, lda, y, ldb, beta, c, m);
7171
}
7272

7373
DLLEXPORT void c_matrix_multiply(CBLAS_TRANSPOSE transA, CBLAS_TRANSPOSE transB, const blas_int m, const blas_int n, const blas_int k, const blas_complex_float alpha, const blas_complex_float x[], const blas_complex_float y[], const blas_complex_float beta, blas_complex_float c[]){
74-
blas_int lda = transA == CblasNoTrans ? m : k;
75-
blas_int ldb = transB == CblasNoTrans ? k : n;
74+
const blas_int lda = transA == CblasNoTrans ? m : k;
75+
const blas_int ldb = transB == CblasNoTrans ? k : n;
7676

7777
cblas_cgemm(CblasColMajor, transA, transB, m, n, k, (float*)&alpha, (float*)x, lda, (float*)y, ldb, (float*)&beta, (float*)c, m);
7878
}
7979

8080
DLLEXPORT void z_matrix_multiply(CBLAS_TRANSPOSE transA, CBLAS_TRANSPOSE transB, const blas_int m, const blas_int n, const blas_int k, const blas_complex_double alpha, const blas_complex_double x[], const blas_complex_double y[], const blas_complex_double beta, blas_complex_double c[]){
81-
blas_int lda = transA == CblasNoTrans ? m : k;
82-
blas_int ldb = transB == CblasNoTrans ? k : n;
81+
const blas_int lda = transA == CblasNoTrans ? m : k;
82+
const blas_int ldb = transB == CblasNoTrans ? k : n;
8383

8484
cblas_zgemm(CblasColMajor, transA, transB, m, n, k, (double*)&alpha, (double*)x, lda, (double*)y, ldb, (double*)&beta, (double*)c, m);
8585
}

‎src/Numerics.Tests/Numerics.Tests.CUDA.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<IsPackable>false</IsPackable>
1010
<VersionPrefix>5.0.0</VersionPrefix>
1111
<VersionSuffix>alpha02</VersionSuffix>
12+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1213
<DefineConstants>CUDA</DefineConstants>
1314
</PropertyGroup>
1415
<ItemGroup>

‎src/Numerics.Tests/Numerics.Tests.MKL.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<IsPackable>false</IsPackable>
1010
<VersionPrefix>5.0.0</VersionPrefix>
1111
<VersionSuffix>alpha02</VersionSuffix>
12+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1213
<DefineConstants>MKL</DefineConstants>
1314
</PropertyGroup>
1415
<ItemGroup>

‎src/Numerics.Tests/Numerics.Tests.OpenBLAS.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<IsPackable>false</IsPackable>
1010
<VersionPrefix>5.0.0</VersionPrefix>
1111
<VersionSuffix>alpha02</VersionSuffix>
12+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
1213
<DefineConstants>OPENBLAS</DefineConstants>
1314
</PropertyGroup>
1415
<ItemGroup>

0 commit comments

Comments
 (0)