diff --git a/src/Providers.CUDA/NativeProviderLoader.cs b/src/Providers.CUDA/NativeProviderLoader.cs index b1e72510..c28b6e01 100644 --- a/src/Providers.CUDA/NativeProviderLoader.cs +++ b/src/Providers.CUDA/NativeProviderLoader.cs @@ -171,6 +171,7 @@ namespace MathNet.Numerics.Providers.CUDA { case Runtime.WindowsX64: if (TryLoadFile(directory, "x64", fileName) + || TryLoadFile(directory, "runtimes/win-x64", fileName) || TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64", fileName)) { @@ -179,6 +180,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.WindowsX86: if (TryLoadFile(directory, "x86", fileName) + || TryLoadFile(directory, "runtimes/win-x86", fileName) || TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86", fileName)) { @@ -187,6 +189,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.WindowsArm64: if (TryLoadFile(directory, "arm64", fileName) + || TryLoadFile(directory, "runtimes/win-arm64", fileName) || TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64", fileName)) { @@ -195,6 +198,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.WindowsArm: if (TryLoadFile(directory, "arm", fileName) + || TryLoadFile(directory, "runtimes/win-arm", fileName) || TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm", fileName)) { @@ -203,6 +207,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.LinuxX64: if (TryLoadFile(directory, "x64", fileName) + || TryLoadFile(directory, "runtimes/linux-x64", fileName) || TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64", fileName)) { @@ -211,6 +216,7 @@ namespace MathNet.Numerics.Providers.CUDA break; case Runtime.LinuxX86: if (TryLoadFile(directory, "x86", fileName) + || TryLoadFile(directory, "runtimes/linux-x86", 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 9eea4b23..ca0b2736 100644 --- a/src/Providers.MKL/NativeProviderLoader.cs +++ b/src/Providers.MKL/NativeProviderLoader.cs @@ -173,6 +173,7 @@ namespace MathNet.Numerics.Providers.MKL { case Runtime.WindowsX64: if (TryLoadFile(directory, "x64", fileName) + || TryLoadFile(directory, "runtimes/win-x64", fileName) || TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64", fileName)) { @@ -181,6 +182,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.WindowsX86: if (TryLoadFile(directory, "x86", fileName) + || TryLoadFile(directory, "runtimes/win-x86", fileName) || TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86", fileName)) { @@ -189,6 +191,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.WindowsArm64: if (TryLoadFile(directory, "arm64", fileName) + || TryLoadFile(directory, "runtimes/win-arm64", fileName) || TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64", fileName)) { @@ -197,6 +200,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.WindowsArm: if (TryLoadFile(directory, "arm", fileName) + || TryLoadFile(directory, "runtimes/win-arm", fileName) || TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm", fileName)) { @@ -205,6 +209,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.LinuxX64: if (TryLoadFile(directory, "x64", fileName) + || TryLoadFile(directory, "runtimes/linux-x64", fileName) || TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64", fileName)) { @@ -213,6 +218,7 @@ namespace MathNet.Numerics.Providers.MKL break; case Runtime.LinuxX86: if (TryLoadFile(directory, "x86", fileName) + || TryLoadFile(directory, "runtimes/linux-x86", 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 c8b995cf..42811a5a 100644 --- a/src/Providers.OpenBLAS/NativeProviderLoader.cs +++ b/src/Providers.OpenBLAS/NativeProviderLoader.cs @@ -171,6 +171,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS { case Runtime.WindowsX64: if (TryLoadFile(directory, "x64", fileName) + || TryLoadFile(directory, "runtimes/win-x64", fileName) || TryLoadFile(directory, "win-x64/native", fileName) || TryLoadFile(directory, "win-x64", fileName)) { @@ -179,6 +180,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.WindowsX86: if (TryLoadFile(directory, "x86", fileName) + || TryLoadFile(directory, "runtimes/win-x86", fileName) || TryLoadFile(directory, "win-x86/native", fileName) || TryLoadFile(directory, "win-x86", fileName)) { @@ -187,6 +189,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.WindowsArm64: if (TryLoadFile(directory, "arm64", fileName) + || TryLoadFile(directory, "runtimes/win-arm64", fileName) || TryLoadFile(directory, "win-arm64/native", fileName) || TryLoadFile(directory, "win-arm64", fileName)) { @@ -195,6 +198,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.WindowsArm: if (TryLoadFile(directory, "arm", fileName) + || TryLoadFile(directory, "runtimes/win-arm", fileName) || TryLoadFile(directory, "win-arm/native", fileName) || TryLoadFile(directory, "win-arm", fileName)) { @@ -203,6 +207,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.LinuxX64: if (TryLoadFile(directory, "x64", fileName) + || TryLoadFile(directory, "runtimes/linux-x64", fileName) || TryLoadFile(directory, "linux-x64/native", fileName) || TryLoadFile(directory, "linux-x64", fileName)) { @@ -211,6 +216,7 @@ namespace MathNet.Numerics.Providers.OpenBLAS break; case Runtime.LinuxX86: if (TryLoadFile(directory, "x86", fileName) + || TryLoadFile(directory, "runtimes/linux-x86", fileName) || TryLoadFile(directory, "linux-x86/native", fileName) || TryLoadFile(directory, "linux-x86", fileName)) {