ufkc7e3d
/
mathnet-numerics
forked from tsai/mathnet-numerics
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Providers: add probe for 'runtimes/RID' paths

dependabot/nuget/NUnit3TestAdapter-4.2.0
Christoph Ruegg 5 years ago
parent
58d1c85608
commit
9ccd2b81f8
3 changed files with 18 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Providers.CUDA/NativeProviderLoader.cs
  2. 6
      src/Providers.MKL/NativeProviderLoader.cs
  3. 6
      src/Providers.OpenBLAS/NativeProviderLoader.cs

6
src/Providers.CUDA/NativeProviderLoader.cs
View File

@ -171,6 +171,7 @@ namespace MathNet.Numerics.Providers.CUDA
{ {
case Runtime.WindowsX64: case Runtime.WindowsX64:
if (TryLoadFile(directory, "x64", fileName) if (TryLoadFile(directory, "x64", fileName)
|| TryLoadFile(directory, "runtimes/win-x64", fileName)
|| TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64/native", fileName)
|| TryLoadFile(directory, "win-x64", fileName)) || TryLoadFile(directory, "win-x64", fileName))
{ {
@ -179,6 +180,7 @@ namespace MathNet.Numerics.Providers.CUDA
break; break;
case Runtime.WindowsX86: case Runtime.WindowsX86:
if (TryLoadFile(directory, "x86", fileName) if (TryLoadFile(directory, "x86", fileName)
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
|| TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86/native", fileName)
|| TryLoadFile(directory, "win-x86", fileName)) || TryLoadFile(directory, "win-x86", fileName))
{ {
@ -187,6 +189,7 @@ namespace MathNet.Numerics.Providers.CUDA
break; break;
case Runtime.WindowsArm64: case Runtime.WindowsArm64:
if (TryLoadFile(directory, "arm64", fileName) if (TryLoadFile(directory, "arm64", fileName)
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
|| TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64/native", fileName)
|| TryLoadFile(directory, "win-arm64", fileName)) || TryLoadFile(directory, "win-arm64", fileName))
{ {
@ -195,6 +198,7 @@ namespace MathNet.Numerics.Providers.CUDA
break; break;
case Runtime.WindowsArm: case Runtime.WindowsArm:
if (TryLoadFile(directory, "arm", fileName) if (TryLoadFile(directory, "arm", fileName)
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
|| TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm/native", fileName)
|| TryLoadFile(directory, "win-arm", fileName)) || TryLoadFile(directory, "win-arm", fileName))
{ {
@ -203,6 +207,7 @@ namespace MathNet.Numerics.Providers.CUDA
break; break;
case Runtime.LinuxX64: case Runtime.LinuxX64:
if (TryLoadFile(directory, "x64", fileName) if (TryLoadFile(directory, "x64", fileName)
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
|| TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64/native", fileName)
|| TryLoadFile(directory, "linux-x64", fileName)) || TryLoadFile(directory, "linux-x64", fileName))
{ {
@ -211,6 +216,7 @@ namespace MathNet.Numerics.Providers.CUDA
break; break;
case Runtime.LinuxX86: case Runtime.LinuxX86:
if (TryLoadFile(directory, "x86", fileName) if (TryLoadFile(directory, "x86", fileName)
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
|| TryLoadFile(directory, "linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86/native", fileName)
|| TryLoadFile(directory, "linux-x86", fileName)) || TryLoadFile(directory, "linux-x86", fileName))
{ {

6
src/Providers.MKL/NativeProviderLoader.cs
View File

@ -173,6 +173,7 @@ namespace MathNet.Numerics.Providers.MKL
{ {
case Runtime.WindowsX64: case Runtime.WindowsX64:
if (TryLoadFile(directory, "x64", fileName) if (TryLoadFile(directory, "x64", fileName)
|| TryLoadFile(directory, "runtimes/win-x64", fileName)
|| TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64/native", fileName)
|| TryLoadFile(directory, "win-x64", fileName)) || TryLoadFile(directory, "win-x64", fileName))
{ {
@ -181,6 +182,7 @@ namespace MathNet.Numerics.Providers.MKL
break; break;
case Runtime.WindowsX86: case Runtime.WindowsX86:
if (TryLoadFile(directory, "x86", fileName) if (TryLoadFile(directory, "x86", fileName)
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
|| TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86/native", fileName)
|| TryLoadFile(directory, "win-x86", fileName)) || TryLoadFile(directory, "win-x86", fileName))
{ {
@ -189,6 +191,7 @@ namespace MathNet.Numerics.Providers.MKL
break; break;
case Runtime.WindowsArm64: case Runtime.WindowsArm64:
if (TryLoadFile(directory, "arm64", fileName) if (TryLoadFile(directory, "arm64", fileName)
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
|| TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64/native", fileName)
|| TryLoadFile(directory, "win-arm64", fileName)) || TryLoadFile(directory, "win-arm64", fileName))
{ {
@ -197,6 +200,7 @@ namespace MathNet.Numerics.Providers.MKL
break; break;
case Runtime.WindowsArm: case Runtime.WindowsArm:
if (TryLoadFile(directory, "arm", fileName) if (TryLoadFile(directory, "arm", fileName)
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
|| TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm/native", fileName)
|| TryLoadFile(directory, "win-arm", fileName)) || TryLoadFile(directory, "win-arm", fileName))
{ {
@ -205,6 +209,7 @@ namespace MathNet.Numerics.Providers.MKL
break; break;
case Runtime.LinuxX64: case Runtime.LinuxX64:
if (TryLoadFile(directory, "x64", fileName) if (TryLoadFile(directory, "x64", fileName)
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
|| TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64/native", fileName)
|| TryLoadFile(directory, "linux-x64", fileName)) || TryLoadFile(directory, "linux-x64", fileName))
{ {
@ -213,6 +218,7 @@ namespace MathNet.Numerics.Providers.MKL
break; break;
case Runtime.LinuxX86: case Runtime.LinuxX86:
if (TryLoadFile(directory, "x86", fileName) if (TryLoadFile(directory, "x86", fileName)
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
|| TryLoadFile(directory, "linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86/native", fileName)
|| TryLoadFile(directory, "linux-x86", fileName)) || TryLoadFile(directory, "linux-x86", fileName))
{ {

6
src/Providers.OpenBLAS/NativeProviderLoader.cs
View File

@ -171,6 +171,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS
{ {
case Runtime.WindowsX64: case Runtime.WindowsX64:
if (TryLoadFile(directory, "x64", fileName) if (TryLoadFile(directory, "x64", fileName)
|| TryLoadFile(directory, "runtimes/win-x64", fileName)
|| TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64/native", fileName)
|| TryLoadFile(directory, "win-x64", fileName)) || TryLoadFile(directory, "win-x64", fileName))
{ {
@ -179,6 +180,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS
break; break;
case Runtime.WindowsX86: case Runtime.WindowsX86:
if (TryLoadFile(directory, "x86", fileName) if (TryLoadFile(directory, "x86", fileName)
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
|| TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86/native", fileName)
|| TryLoadFile(directory, "win-x86", fileName)) || TryLoadFile(directory, "win-x86", fileName))
{ {
@ -187,6 +189,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS
break; break;
case Runtime.WindowsArm64: case Runtime.WindowsArm64:
if (TryLoadFile(directory, "arm64", fileName) if (TryLoadFile(directory, "arm64", fileName)
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
|| TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64/native", fileName)
|| TryLoadFile(directory, "win-arm64", fileName)) || TryLoadFile(directory, "win-arm64", fileName))
{ {
@ -195,6 +198,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS
break; break;
case Runtime.WindowsArm: case Runtime.WindowsArm:
if (TryLoadFile(directory, "arm", fileName) if (TryLoadFile(directory, "arm", fileName)
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
|| TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm/native", fileName)
|| TryLoadFile(directory, "win-arm", fileName)) || TryLoadFile(directory, "win-arm", fileName))
{ {
@ -203,6 +207,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS
break; break;
case Runtime.LinuxX64: case Runtime.LinuxX64:
if (TryLoadFile(directory, "x64", fileName) if (TryLoadFile(directory, "x64", fileName)
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
|| TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64/native", fileName)
|| TryLoadFile(directory, "linux-x64", fileName)) || TryLoadFile(directory, "linux-x64", fileName))
{ {
@ -211,6 +216,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS
break; break;
case Runtime.LinuxX86: case Runtime.LinuxX86:
if (TryLoadFile(directory, "x86", fileName) if (TryLoadFile(directory, "x86", fileName)
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
|| TryLoadFile(directory, "linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86/native", fileName)
|| TryLoadFile(directory, "linux-x86", fileName)) || TryLoadFile(directory, "linux-x86", fileName))
{ {

Write Preview
Loading…
Cancel
Save