Skip to content

Commit 9ccd2b8

Browse files
cdrnetcdrnet
committed
Providers: add probe for 'runtimes/RID' paths
1 parent 58d1c85 commit 9ccd2b8

3 files changed

Lines changed: 18 additions & 0 deletions

File tree

‎src/Providers.CUDA/NativeProviderLoader.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +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)
174175
|| TryLoadFile(directory, "win-x64/native", fileName)
175176
|| TryLoadFile(directory, "win-x64", fileName))
176177
{
@@ -179,6 +180,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
179180
break;
180181
case Runtime.WindowsX86:
181182
if (TryLoadFile(directory, "x86", fileName)
183+
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
182184
|| TryLoadFile(directory, "win-x86/native", fileName)
183185
|| TryLoadFile(directory, "win-x86", fileName))
184186
{
@@ -187,6 +189,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
187189
break;
188190
case Runtime.WindowsArm64:
189191
if (TryLoadFile(directory, "arm64", fileName)
192+
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
190193
|| TryLoadFile(directory, "win-arm64/native", fileName)
191194
|| TryLoadFile(directory, "win-arm64", fileName))
192195
{
@@ -195,6 +198,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
195198
break;
196199
case Runtime.WindowsArm:
197200
if (TryLoadFile(directory, "arm", fileName)
201+
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
198202
|| TryLoadFile(directory, "win-arm/native", fileName)
199203
|| TryLoadFile(directory, "win-arm", fileName))
200204
{
@@ -203,6 +207,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
203207
break;
204208
case Runtime.LinuxX64:
205209
if (TryLoadFile(directory, "x64", fileName)
210+
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
206211
|| TryLoadFile(directory, "linux-x64/native", fileName)
207212
|| TryLoadFile(directory, "linux-x64", fileName))
208213
{
@@ -211,6 +216,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
211216
break;
212217
case Runtime.LinuxX86:
213218
if (TryLoadFile(directory, "x86", fileName)
219+
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
214220
|| TryLoadFile(directory, "linux-x86/native", fileName)
215221
|| TryLoadFile(directory, "linux-x86", fileName))
216222
{

‎src/Providers.MKL/NativeProviderLoader.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +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)
176177
|| TryLoadFile(directory, "win-x64/native", fileName)
177178
|| TryLoadFile(directory, "win-x64", fileName))
178179
{
@@ -181,6 +182,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
181182
break;
182183
case Runtime.WindowsX86:
183184
if (TryLoadFile(directory, "x86", fileName)
185+
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
184186
|| TryLoadFile(directory, "win-x86/native", fileName)
185187
|| TryLoadFile(directory, "win-x86", fileName))
186188
{
@@ -189,6 +191,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
189191
break;
190192
case Runtime.WindowsArm64:
191193
if (TryLoadFile(directory, "arm64", fileName)
194+
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
192195
|| TryLoadFile(directory, "win-arm64/native", fileName)
193196
|| TryLoadFile(directory, "win-arm64", fileName))
194197
{
@@ -197,6 +200,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
197200
break;
198201
case Runtime.WindowsArm:
199202
if (TryLoadFile(directory, "arm", fileName)
203+
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
200204
|| TryLoadFile(directory, "win-arm/native", fileName)
201205
|| TryLoadFile(directory, "win-arm", fileName))
202206
{
@@ -205,6 +209,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
205209
break;
206210
case Runtime.LinuxX64:
207211
if (TryLoadFile(directory, "x64", fileName)
212+
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
208213
|| TryLoadFile(directory, "linux-x64/native", fileName)
209214
|| TryLoadFile(directory, "linux-x64", fileName))
210215
{
@@ -213,6 +218,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
213218
break;
214219
case Runtime.LinuxX86:
215220
if (TryLoadFile(directory, "x86", fileName)
221+
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
216222
|| TryLoadFile(directory, "linux-x86/native", fileName)
217223
|| TryLoadFile(directory, "linux-x86", fileName))
218224
{

‎src/Providers.OpenBLAS/NativeProviderLoader.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +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)
174175
|| TryLoadFile(directory, "win-x64/native", fileName)
175176
|| TryLoadFile(directory, "win-x64", fileName))
176177
{
@@ -179,6 +180,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
179180
break;
180181
case Runtime.WindowsX86:
181182
if (TryLoadFile(directory, "x86", fileName)
183+
|| TryLoadFile(directory, "runtimes/win-x86", fileName)
182184
|| TryLoadFile(directory, "win-x86/native", fileName)
183185
|| TryLoadFile(directory, "win-x86", fileName))
184186
{
@@ -187,6 +189,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
187189
break;
188190
case Runtime.WindowsArm64:
189191
if (TryLoadFile(directory, "arm64", fileName)
192+
|| TryLoadFile(directory, "runtimes/win-arm64", fileName)
190193
|| TryLoadFile(directory, "win-arm64/native", fileName)
191194
|| TryLoadFile(directory, "win-arm64", fileName))
192195
{
@@ -195,6 +198,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
195198
break;
196199
case Runtime.WindowsArm:
197200
if (TryLoadFile(directory, "arm", fileName)
201+
|| TryLoadFile(directory, "runtimes/win-arm", fileName)
198202
|| TryLoadFile(directory, "win-arm/native", fileName)
199203
|| TryLoadFile(directory, "win-arm", fileName))
200204
{
@@ -203,6 +207,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
203207
break;
204208
case Runtime.LinuxX64:
205209
if (TryLoadFile(directory, "x64", fileName)
210+
|| TryLoadFile(directory, "runtimes/linux-x64", fileName)
206211
|| TryLoadFile(directory, "linux-x64/native", fileName)
207212
|| TryLoadFile(directory, "linux-x64", fileName))
208213
{
@@ -211,6 +216,7 @@ static bool TryLoadFromDirectory(string fileName, string directory)
211216
break;
212217
case Runtime.LinuxX86:
213218
if (TryLoadFile(directory, "x86", fileName)
219+
|| TryLoadFile(directory, "runtimes/linux-x86", fileName)
214220
|| TryLoadFile(directory, "linux-x86/native", fileName)
215221
|| TryLoadFile(directory, "linux-x86", fileName))
216222
{

0 commit comments

Comments
 (0)