From 901ea1079fbfd0c4b62c40475220722234d922ba Mon Sep 17 00:00:00 2001 From: Christoph Ruegg Date: Sun, 19 Dec 2021 18:34:07 +0100 Subject: [PATCH] Providers: add probe for 'runtimes/RID/native' paths --- src/Providers.CUDA/NativeProviderLoader.cs | 12 ++++++------ src/Providers.MKL/NativeProviderLoader.cs | 12 ++++++------ src/Providers.OpenBLAS/NativeProviderLoader.cs | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Providers.CUDA/NativeProviderLoader.cs b/src/Providers.CUDA/NativeProviderLoader.cs index c28b6e01..ed97d9b4 100644 --- a/src/Providers.CUDA/NativeProviderLoader.cs +++ b/src/Providers.CUDA/NativeProviderLoader.cs @@ -171,7 +171,7 @@ namespace MathNet.Numerics.Providers.CUDA { case Runtime.WindowsX64: if (TryLoadFile(directory, "x64", fileName) - || TryLoadFile(directory, "runtimes/win-x64", fileName) + || TryLoadFile(directory, "runtimes/win-x64/native", fileName) || TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64", fileName)) { @@ -180,7 +180,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.WindowsX86: if (TryLoadFile(directory, "x86", fileName) - || TryLoadFile(directory, "runtimes/win-x86", fileName) + || TryLoadFile(directory, "runtimes/win-x86/native", fileName) || TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86", fileName)) { @@ -189,7 +189,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.WindowsArm64: if (TryLoadFile(directory, "arm64", fileName) - || TryLoadFile(directory, "runtimes/win-arm64", fileName) + || TryLoadFile(directory, "runtimes/win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64", fileName)) { @@ -198,7 +198,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.WindowsArm: if (TryLoadFile(directory, "arm", fileName) - || TryLoadFile(directory, "runtimes/win-arm", fileName) + || TryLoadFile(directory, "runtimes/win-arm/native", fileName) || TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm", fileName)) { @@ -207,7 +207,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.LinuxX64: if (TryLoadFile(directory, "x64", fileName) - || TryLoadFile(directory, "runtimes/linux-x64", fileName) + || TryLoadFile(directory, "runtimes/linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64", fileName)) { @@ -216,7 +216,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.LinuxX86: if (TryLoadFile(directory, "x86", fileName) - || TryLoadFile(directory, "runtimes/linux-x86", fileName) + || TryLoadFile(directory, "runtimes/linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86", fileName)) { diff --git a/src/Providers.MKL/NativeProviderLoader.cs b/src/Providers.MKL/NativeProviderLoader.cs index ca0b2736..133a6457 100644 --- a/src/Providers.MKL/NativeProviderLoader.cs +++ b/src/Providers.MKL/NativeProviderLoader.cs @@ -173,7 +173,7 @@ namespace MathNet.Numerics.Providers.MKL { case Runtime.WindowsX64: if (TryLoadFile(directory, "x64", fileName) - || TryLoadFile(directory, "runtimes/win-x64", fileName) + || TryLoadFile(directory, "runtimes/win-x64/native", fileName) || TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64", fileName)) { @@ -182,7 +182,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.WindowsX86: if (TryLoadFile(directory, "x86", fileName) - || TryLoadFile(directory, "runtimes/win-x86", fileName) + || TryLoadFile(directory, "runtimes/win-x86/native", fileName) || TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86", fileName)) { @@ -191,7 +191,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.WindowsArm64: if (TryLoadFile(directory, "arm64", fileName) - || TryLoadFile(directory, "runtimes/win-arm64", fileName) + || TryLoadFile(directory, "runtimes/win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64", fileName)) { @@ -200,7 +200,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.WindowsArm: if (TryLoadFile(directory, "arm", fileName) - || TryLoadFile(directory, "runtimes/win-arm", fileName) + || TryLoadFile(directory, "runtimes/win-arm/native", fileName) || TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm", fileName)) { @@ -209,7 +209,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.LinuxX64: if (TryLoadFile(directory, "x64", fileName) - || TryLoadFile(directory, "runtimes/linux-x64", fileName) + || TryLoadFile(directory, "runtimes/linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64", fileName)) { @@ -218,7 +218,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.LinuxX86: if (TryLoadFile(directory, "x86", fileName) - || TryLoadFile(directory, "runtimes/linux-x86", fileName) + || TryLoadFile(directory, "runtimes/linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86", fileName)) { diff --git a/src/Providers.OpenBLAS/NativeProviderLoader.cs b/src/Providers.OpenBLAS/NativeProviderLoader.cs index 42811a5a..59baab69 100644 --- a/src/Providers.OpenBLAS/NativeProviderLoader.cs +++ b/src/Providers.OpenBLAS/NativeProviderLoader.cs @@ -171,7 +171,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS { case Runtime.WindowsX64: if (TryLoadFile(directory, "x64", fileName) - || TryLoadFile(directory, "runtimes/win-x64", fileName) + || TryLoadFile(directory, "runtimes/win-x64/native", fileName) || TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64", fileName)) { @@ -180,7 +180,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.WindowsX86: if (TryLoadFile(directory, "x86", fileName) - || TryLoadFile(directory, "runtimes/win-x86", fileName) + || TryLoadFile(directory, "runtimes/win-x86/native", fileName) || TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86", fileName)) { @@ -189,7 +189,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.WindowsArm64: if (TryLoadFile(directory, "arm64", fileName) - || TryLoadFile(directory, "runtimes/win-arm64", fileName) + || TryLoadFile(directory, "runtimes/win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64", fileName)) { @@ -198,7 +198,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.WindowsArm: if (TryLoadFile(directory, "arm", fileName) - || TryLoadFile(directory, "runtimes/win-arm", fileName) + || TryLoadFile(directory, "runtimes/win-arm/native", fileName) || TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm", fileName)) { @@ -207,7 +207,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.LinuxX64: if (TryLoadFile(directory, "x64", fileName) - || TryLoadFile(directory, "runtimes/linux-x64", fileName) + || TryLoadFile(directory, "runtimes/linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64", fileName)) { @@ -216,7 +216,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.LinuxX86: if (TryLoadFile(directory, "x86", fileName) - || TryLoadFile(directory, "runtimes/linux-x86", fileName) + || TryLoadFile(directory, "runtimes/linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86", fileName)) {