Skip to content

Commit 901ea10

Browse files
cdrnetcdrnet
committed
Providers: add probe for 'runtimes/RID/native' paths
1 parent 50b8912 commit 901ea10

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎src/Providers.CUDA/NativeProviderLoader.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
171171
{
172172
case Runtime.WindowsX64:
173173
if (TryLoadFile(directory, "x64", fileName)
174-
|| TryLoadFile(directory, "runtimes/win-x64", fileName)
174+
|| TryLoadFile(directory, "runtimes/win-x64/native", fileName)
175175
|| TryLoadFile(directory, "win-x64/native", fileName)
176176
|| TryLoadFile(directory, "win-x64", fileName))
177177
{
@@ -180,7 +180,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
180180
break;
181181
case Runtime.WindowsX86:
182182
if (TryLoadFile(directory, "x86", fileName)
183-
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
183+
|| TryLoadFile(directory, "runtimes/win-x86/native", fileName)
184184
|| TryLoadFile(directory, "win-x86/native", fileName)
185185
|| TryLoadFile(directory, "win-x86", fileName))
186186
{
@@ -189,7 +189,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
189189
break;
190190
case Runtime.WindowsArm64:
191191
if (TryLoadFile(directory, "arm64", fileName)
192-
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
192+
|| TryLoadFile(directory, "runtimes/win-arm64/native", fileName)
193193
|| TryLoadFile(directory, "win-arm64/native", fileName)
194194
|| TryLoadFile(directory, "win-arm64", fileName))
195195
{
@@ -198,7 +198,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
198198
break;
199199
case Runtime.WindowsArm:
200200
if (TryLoadFile(directory, "arm", fileName)
201-
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
201+
|| TryLoadFile(directory, "runtimes/win-arm/native", fileName)
202202
|| TryLoadFile(directory, "win-arm/native", fileName)
203203
|| TryLoadFile(directory, "win-arm", fileName))
204204
{
@@ -207,7 +207,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
207207
break;
208208
case Runtime.LinuxX64:
209209
if (TryLoadFile(directory, "x64", fileName)
210-
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
210+
|| TryLoadFile(directory, "runtimes/linux-x64/native", fileName)
211211
|| TryLoadFile(directory, "linux-x64/native", fileName)
212212
|| TryLoadFile(directory, "linux-x64", fileName))
213213
{
@@ -216,7 +216,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
216216
break;
217217
case Runtime.LinuxX86:
218218
if (TryLoadFile(directory, "x86", fileName)
219-
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
219+
|| TryLoadFile(directory, "runtimes/linux-x86/native", fileName)
220220
|| TryLoadFile(directory, "linux-x86/native", fileName)
221221
|| TryLoadFile(directory, "linux-x86", fileName))
222222
{

‎src/Providers.MKL/NativeProviderLoader.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
173173
{
174174
case Runtime.WindowsX64:
175175
if (TryLoadFile(directory, "x64", fileName)
176-
|| TryLoadFile(directory, "runtimes/win-x64", fileName)
176+
|| TryLoadFile(directory, "runtimes/win-x64/native", fileName)
177177
|| TryLoadFile(directory, "win-x64/native", fileName)
178178
|| TryLoadFile(directory, "win-x64", fileName))
179179
{
@@ -182,7 +182,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
182182
break;
183183
case Runtime.WindowsX86:
184184
if (TryLoadFile(directory, "x86", fileName)
185-
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
185+
|| TryLoadFile(directory, "runtimes/win-x86/native", fileName)
186186
|| TryLoadFile(directory, "win-x86/native", fileName)
187187
|| TryLoadFile(directory, "win-x86", fileName))
188188
{
@@ -191,7 +191,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
191191
break;
192192
case Runtime.WindowsArm64:
193193
if (TryLoadFile(directory, "arm64", fileName)
194-
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
194+
|| TryLoadFile(directory, "runtimes/win-arm64/native", fileName)
195195
|| TryLoadFile(directory, "win-arm64/native", fileName)
196196
|| TryLoadFile(directory, "win-arm64", fileName))
197197
{
@@ -200,7 +200,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
200200
break;
201201
case Runtime.WindowsArm:
202202
if (TryLoadFile(directory, "arm", fileName)
203-
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
203+
|| TryLoadFile(directory, "runtimes/win-arm/native", fileName)
204204
|| TryLoadFile(directory, "win-arm/native", fileName)
205205
|| TryLoadFile(directory, "win-arm", fileName))
206206
{
@@ -209,7 +209,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
209209
break;
210210
case Runtime.LinuxX64:
211211
if (TryLoadFile(directory, "x64", fileName)
212-
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
212+
|| TryLoadFile(directory, "runtimes/linux-x64/native", fileName)
213213
|| TryLoadFile(directory, "linux-x64/native", fileName)
214214
|| TryLoadFile(directory, "linux-x64", fileName))
215215
{
@@ -218,7 +218,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
218218
break;
219219
case Runtime.LinuxX86:
220220
if (TryLoadFile(directory, "x86", fileName)
221-
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
221+
|| TryLoadFile(directory, "runtimes/linux-x86/native", fileName)
222222
|| TryLoadFile(directory, "linux-x86/native", fileName)
223223
|| TryLoadFile(directory, "linux-x86", fileName))
224224
{

‎src/Providers.OpenBLAS/NativeProviderLoader.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
171171
{
172172
case Runtime.WindowsX64:
173173
if (TryLoadFile(directory, "x64", fileName)
174-
|| TryLoadFile(directory, "runtimes/win-x64", fileName)
174+
|| TryLoadFile(directory, "runtimes/win-x64/native", fileName)
175175
|| TryLoadFile(directory, "win-x64/native", fileName)
176176
|| TryLoadFile(directory, "win-x64", fileName))
177177
{
@@ -180,7 +180,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
180180
break;
181181
case Runtime.WindowsX86:
182182
if (TryLoadFile(directory, "x86", fileName)
183-
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
183+
|| TryLoadFile(directory, "runtimes/win-x86/native", fileName)
184184
|| TryLoadFile(directory, "win-x86/native", fileName)
185185
|| TryLoadFile(directory, "win-x86", fileName))
186186
{
@@ -189,7 +189,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
189189
break;
190190
case Runtime.WindowsArm64:
191191
if (TryLoadFile(directory, "arm64", fileName)
192-
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
192+
|| TryLoadFile(directory, "runtimes/win-arm64/native", fileName)
193193
|| TryLoadFile(directory, "win-arm64/native", fileName)
194194
|| TryLoadFile(directory, "win-arm64", fileName))
195195
{
@@ -198,7 +198,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
198198
break;
199199
case Runtime.WindowsArm:
200200
if (TryLoadFile(directory, "arm", fileName)
201-
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
201+
|| TryLoadFile(directory, "runtimes/win-arm/native", fileName)
202202
|| TryLoadFile(directory, "win-arm/native", fileName)
203203
|| TryLoadFile(directory, "win-arm", fileName))
204204
{
@@ -207,7 +207,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
207207
break;
208208
case Runtime.LinuxX64:
209209
if (TryLoadFile(directory, "x64", fileName)
210-
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
210+
|| TryLoadFile(directory, "runtimes/linux-x64/native", fileName)
211211
|| TryLoadFile(directory, "linux-x64/native", fileName)
212212
|| TryLoadFile(directory, "linux-x64", fileName))
213213
{
@@ -216,7 +216,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
216216
break;
217217
case Runtime.LinuxX86:
218218
if (TryLoadFile(directory, "x86", fileName)
219-
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
219+
|| TryLoadFile(directory, "runtimes/linux-x86/native", fileName)
220220
|| TryLoadFile(directory, "linux-x86/native", fileName)
221221
|| TryLoadFile(directory, "linux-x86", fileName))
222222
{

0 commit comments

Comments
 (0)