Release v5.0.0-alpha13

mathnet · Feb 27, 2022 · bbea441 · bbea441
1 parent d6d8164
commit bbea441
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 26 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,4 +1,4 @@
-### 5.0.0-alpha12 - 2022-02-27
+### 5.0.0-alpha13 - 2022-02-27
 * COMPATIBILITY: net5.0, net48 better supported with explicit builds
 * COMPATIBILITY: netstandard1.x, net40, net45 no longer supported
 * BREAKING: drop all which was marked as obsolete

diff --git a/src/Data.Matlab/Data.Matlab.csproj b/src/Data.Matlab/Data.Matlab.csproj
@@ -9,7 +9,7 @@
         <PackageId>MathNet.Numerics.Data.Matlab</PackageId>
         <PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Data.Matlab.Signed</PackageId>
         <VersionPrefix>5.0.0</VersionPrefix>
-        <VersionSuffix>alpha12</VersionSuffix>
+        <VersionSuffix>alpha13</VersionSuffix>
         <Title>Math.NET Numerics - MATLAB Data I/O Extensions$(TitleSuffix)</Title>
         <Description>MathWorks MATLAB Data Input/Output Extensions for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
         <PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

diff --git a/src/Data.Text/Data.Text.csproj b/src/Data.Text/Data.Text.csproj
@@ -9,7 +9,7 @@
         <PackageId>MathNet.Numerics.Data.Text</PackageId>
         <PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Data.Text.Signed</PackageId>
         <VersionPrefix>5.0.0</VersionPrefix>
-        <VersionSuffix>alpha12</VersionSuffix>
+        <VersionSuffix>alpha13</VersionSuffix>
         <Title>Math.NET Numerics - Text Data I/O Extensions$(TitleSuffix)</Title>
         <Description>Text Data Input/Output Extensions for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
         <PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

diff --git a/src/FSharp/FSharp.fsproj b/src/FSharp/FSharp.fsproj
@@ -9,7 +9,7 @@
         <PackageId>MathNet.Numerics.FSharp</PackageId>
         <PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.FSharp.Signed</PackageId>
         <VersionPrefix>5.0.0</VersionPrefix>
-        <VersionSuffix>alpha12</VersionSuffix>
+        <VersionSuffix>alpha13</VersionSuffix>
         <Title>Math.NET Numerics for F#$(TitleSuffix)</Title>
         <Description>F# Modules for Math.NET Numerics, the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .NET 5.0 or higher, .NET Standard 2.0 and .NET Framework 4.6.1 or higher, on Windows, Linux and Mac.$(DescriptionSuffix)</Description>
         <PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj
@@ -9,7 +9,7 @@
     <PackageId>MathNet.Numerics</PackageId>
     <PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Signed</PackageId>
     <VersionPrefix>5.0.0</VersionPrefix>
-    <VersionSuffix>alpha12</VersionSuffix>
+    <VersionSuffix>alpha13</VersionSuffix>
     <Title>Math.NET Numerics$(TitleSuffix)</Title>
     <Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use. Supports .NET 5.0 or higher, .NET Standard 2.0 and .NET Framework 4.6.1 or higher, on Windows, Linux and Mac.$(DescriptionSuffix)</Description>
     <PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

diff --git a/src/Providers.CUDA/Providers.CUDA.csproj b/src/Providers.CUDA/Providers.CUDA.csproj
@@ -9,7 +9,7 @@
     <PackageId>MathNet.Numerics.Providers.CUDA</PackageId>
     <PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.CUDA.Signed</PackageId>
     <VersionPrefix>5.0.0</VersionPrefix>
-    <VersionSuffix>alpha12</VersionSuffix>
+    <VersionSuffix>alpha13</VersionSuffix>
     <Title>Math.NET Numerics CUDA Provider$(TitleSuffix)</Title>
     <Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
     <PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

diff --git a/src/Providers.MKL/NativeProviderLoader.cs b/src/Providers.MKL/NativeProviderLoader.cs
@@ -135,10 +135,11 @@ internal static bool TryLoad(string fileName, string hintPath)
                 return true;
             }
 
-            if (!IsWindows && fileName.StartsWith("lib") && TryLoadDirect(fileName.Substring(3)))
-            {
-                return true;
-            }
+            // NOTE: doesn't actually work since the p/invoke is then wrong
+            //if (!IsWindows && fileName.StartsWith("lib") && TryLoadDirect(fileName.Substring(3)))
+            //{
+            //    return true;
+            //}
 
             // If we have hint path provided by the user, look there next
             if (hintPath != null && TryLoadFromDirectory(fileName, hintPath))
@@ -304,12 +305,19 @@ static bool TryLoadDirect(string fileName)
 #if NET5_0_OR_GREATER
                 try
                 {
-                    return NativeLibrary.TryLoad(fileName, out libraryHandle);
+                    if (!NativeLibrary.TryLoad(fileName, out libraryHandle) || libraryHandle == IntPtr.Zero)
+                    {
+                        return false;
+                    }
                 }
                 catch
                 {
                     return false;
                 }
+
+                NativeHandles.Value[fileName] = libraryHandle;
+                return true;
+
 #else
                 try
                 {
@@ -327,14 +335,12 @@ static bool TryLoadDirect(string fileName)
                     int lastError = Marshal.GetLastWin32Error();
                     var exception = new System.ComponentModel.Win32Exception(lastError);
                     LastException = exception;
-                }
-                else
-                {
-                    LastException = null;
-                    NativeHandles.Value[fileName] = libraryHandle;
+                    return false;
                 }
 
-                return libraryHandle != IntPtr.Zero;
+                LastException = null;
+                NativeHandles.Value[fileName] = libraryHandle;
+                return true;
 #endif
             }
         }
@@ -363,12 +369,19 @@ static bool TryLoadFile(string directory, string relativePath, string fileName)
 #if NET5_0_OR_GREATER
                 try
                 {
-                    return NativeLibrary.TryLoad(fullPath, out libraryHandle);
+                    if (!NativeLibrary.TryLoad(fullPath, out libraryHandle) || libraryHandle == IntPtr.Zero)
+                    {
+                        return false;
+                    }
                 }
                 catch
                 {
                     return false;
                 }
+
+                NativeHandles.Value[fileName] = libraryHandle;
+                return true;
+
 #else
                 try
                 {
@@ -386,14 +399,12 @@ static bool TryLoadFile(string directory, string relativePath, string fileName)
                     int lastError = Marshal.GetLastWin32Error();
                     var exception = new System.ComponentModel.Win32Exception(lastError);
                     LastException = exception;
-                }
-                else
-                {
-                    LastException = null;
-                    NativeHandles.Value[fileName] = libraryHandle;
+                    return false;
                 }
 
-                return libraryHandle != IntPtr.Zero;
+                LastException = null;
+                NativeHandles.Value[fileName] = libraryHandle;
+                return true;
 #endif
             }
         }

diff --git a/src/Providers.MKL/Providers.MKL.csproj b/src/Providers.MKL/Providers.MKL.csproj
@@ -9,7 +9,7 @@
     <PackageId>MathNet.Numerics.Providers.MKL</PackageId>
     <PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.MKL.Signed</PackageId>
     <VersionPrefix>5.0.0</VersionPrefix>
-    <VersionSuffix>alpha12</VersionSuffix>
+    <VersionSuffix>alpha13</VersionSuffix>
     <Title>Math.NET Numerics MKL Provider$(TitleSuffix)</Title>
     <Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
     <PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

diff --git a/src/Providers.OpenBLAS/Providers.OpenBLAS.csproj b/src/Providers.OpenBLAS/Providers.OpenBLAS.csproj
@@ -9,7 +9,7 @@
     <PackageId>MathNet.Numerics.Providers.OpenBLAS</PackageId>
     <PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.OpenBLAS.Signed</PackageId>
     <VersionPrefix>5.0.0</VersionPrefix>
-    <VersionSuffix>alpha12</VersionSuffix>
+    <VersionSuffix>alpha13</VersionSuffix>
     <Title>Math.NET Numerics OpenBLAS Provider$(TitleSuffix)</Title>
     <Description>Math.NET Numerics is the numerical foundation of the Math.NET project, aiming to provide methods and algorithms for numerical computations in science, engineering and every day use.$(DescriptionSuffix)</Description>
     <PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds