Skip to content

Commit bbea441

Browse files
cdrnetcdrnet
committed
Release v5.0.0-alpha13
1 parent d6d8164 commit bbea441

9 files changed

Lines changed: 37 additions & 26 deletions

File tree

‎RELEASENOTES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### 5.0.0-alpha12 - 2022-02-27
1+
### 5.0.0-alpha13 - 2022-02-27
22
* COMPATIBILITY: net5.0, net48 better supported with explicit builds
33
* COMPATIBILITY: netstandard1.x, net40, net45 no longer supported
44
* BREAKING: drop all which was marked as obsolete

‎src/Data.Matlab/Data.Matlab.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>MathNet.Numerics.Data.Matlab</PackageId>
1010
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Data.Matlab.Signed</PackageId>
1111
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>alpha12</VersionSuffix>
12+
<VersionSuffix>alpha13</VersionSuffix>
1313
<Title>Math.NET Numerics - MATLAB Data I/O Extensions$(TitleSuffix)</Title>
1414
<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>
1515
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

‎src/Data.Text/Data.Text.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>MathNet.Numerics.Data.Text</PackageId>
1010
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Data.Text.Signed</PackageId>
1111
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>alpha12</VersionSuffix>
12+
<VersionSuffix>alpha13</VersionSuffix>
1313
<Title>Math.NET Numerics - Text Data I/O Extensions$(TitleSuffix)</Title>
1414
<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>
1515
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

‎src/FSharp/FSharp.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>MathNet.Numerics.FSharp</PackageId>
1010
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.FSharp.Signed</PackageId>
1111
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>alpha12</VersionSuffix>
12+
<VersionSuffix>alpha13</VersionSuffix>
1313
<Title>Math.NET Numerics for F#$(TitleSuffix)</Title>
1414
<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>
1515
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

‎src/Numerics/Numerics.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>MathNet.Numerics</PackageId>
1010
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Signed</PackageId>
1111
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>alpha12</VersionSuffix>
12+
<VersionSuffix>alpha13</VersionSuffix>
1313
<Title>Math.NET Numerics$(TitleSuffix)</Title>
1414
<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>
1515
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

‎src/Providers.CUDA/Providers.CUDA.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>MathNet.Numerics.Providers.CUDA</PackageId>
1010
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.CUDA.Signed</PackageId>
1111
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>alpha12</VersionSuffix>
12+
<VersionSuffix>alpha13</VersionSuffix>
1313
<Title>Math.NET Numerics CUDA Provider$(TitleSuffix)</Title>
1414
<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>
1515
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

‎src/Providers.MKL/NativeProviderLoader.cs‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,11 @@ internal static bool TryLoad(string fileName, string hintPath)
135135
return true;
136136
}
137137

138-
if (!IsWindows && fileName.StartsWith("lib") && TryLoadDirect(fileName.Substring(3)))
139-
{
140-
return true;
141-
}
138+
// NOTE: doesn't actually work since the p/invoke is then wrong
139+
//if (!IsWindows && fileName.StartsWith("lib") && TryLoadDirect(fileName.Substring(3)))
140+
//{
141+
// return true;
142+
//}
142143

143144
// If we have hint path provided by the user, look there next
144145
if (hintPath != null && TryLoadFromDirectory(fileName, hintPath))
@@ -304,12 +305,19 @@ static bool TryLoadDirect(string fileName)
304305
#if NET5_0_OR_GREATER
305306
try
306307
{
307-
return NativeLibrary.TryLoad(fileName, out libraryHandle);
308+
if (!NativeLibrary.TryLoad(fileName, out libraryHandle) || libraryHandle == IntPtr.Zero)
309+
{
310+
return false;
311+
}
308312
}
309313
catch
310314
{
311315
return false;
312316
}
317+
318+
NativeHandles.Value[fileName] = libraryHandle;
319+
return true;
320+
313321
#else
314322
try
315323
{
@@ -327,14 +335,12 @@ static bool TryLoadDirect(string fileName)
327335
int lastError = Marshal.GetLastWin32Error();
328336
var exception = new System.ComponentModel.Win32Exception(lastError);
329337
LastException = exception;
330-
}
331-
else
332-
{
333-
LastException = null;
334-
NativeHandles.Value[fileName] = libraryHandle;
338+
return false;
335339
}
336340

337-
return libraryHandle != IntPtr.Zero;
341+
LastException = null;
342+
NativeHandles.Value[fileName] = libraryHandle;
343+
return true;
338344
#endif
339345
}
340346
}
@@ -363,12 +369,19 @@ static bool TryLoadFile(string directory, string relativePath, string fileName)
363369
#if NET5_0_OR_GREATER
364370
try
365371
{
366-
return NativeLibrary.TryLoad(fullPath, out libraryHandle);
372+
if (!NativeLibrary.TryLoad(fullPath, out libraryHandle) || libraryHandle == IntPtr.Zero)
373+
{
374+
return false;
375+
}
367376
}
368377
catch
369378
{
370379
return false;
371380
}
381+
382+
NativeHandles.Value[fileName] = libraryHandle;
383+
return true;
384+
372385
#else
373386
try
374387
{
@@ -386,14 +399,12 @@ static bool TryLoadFile(string directory, string relativePath, string fileName)
386399
int lastError = Marshal.GetLastWin32Error();
387400
var exception = new System.ComponentModel.Win32Exception(lastError);
388401
LastException = exception;
389-
}
390-
else
391-
{
392-
LastException = null;
393-
NativeHandles.Value[fileName] = libraryHandle;
402+
return false;
394403
}
395404

396-
return libraryHandle != IntPtr.Zero;
405+
LastException = null;
406+
NativeHandles.Value[fileName] = libraryHandle;
407+
return true;
397408
#endif
398409
}
399410
}

‎src/Providers.MKL/Providers.MKL.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>MathNet.Numerics.Providers.MKL</PackageId>
1010
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.MKL.Signed</PackageId>
1111
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>alpha12</VersionSuffix>
12+
<VersionSuffix>alpha13</VersionSuffix>
1313
<Title>Math.NET Numerics MKL Provider$(TitleSuffix)</Title>
1414
<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>
1515
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

‎src/Providers.OpenBLAS/Providers.OpenBLAS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageId>MathNet.Numerics.Providers.OpenBLAS</PackageId>
1010
<PackageId Condition="'$(StrongName)'=='True'">MathNet.Numerics.Providers.OpenBLAS.Signed</PackageId>
1111
<VersionPrefix>5.0.0</VersionPrefix>
12-
<VersionSuffix>alpha12</VersionSuffix>
12+
<VersionSuffix>alpha13</VersionSuffix>
1313
<Title>Math.NET Numerics OpenBLAS Provider$(TitleSuffix)</Title>
1414
<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>
1515
<PackageReleaseNotes>COMPATIBILITY: net5.0, net48 better supported with explicit builds

0 commit comments

Comments
 (0)