Skip to content

Commit dc5f9fa

Browse files
committed
copy custom op lib to testdata dir
1 parent 817d78b commit dc5f9fa

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

csharp/src/Microsoft.ML.OnnxRuntime/NativeMethods.shared.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ private static IntPtr DllImportResolver(string libraryName, Assembly assembly, D
930930
string assemblyDir = System.IO.Path.GetDirectoryName(assemblyLocation);
931931
string rid = RuntimeInformation.RuntimeIdentifier;
932932

933-
string[] ridsToTry = { rid, "osx-arm64", "osx", "linux-x64", "linux-arm64", "linux" };
933+
string[] ridsToTry = { rid, "osx-arm64", "osx-aarch64", "osx", "linux-x64", "linux-arm64", "linux" };
934934
foreach (var tryRid in ridsToTry)
935935
{
936936
string probePath = System.IO.Path.Combine(assemblyDir, "runtimes", tryRid, "native", mappedName);

tools/ci_build/github/azure-pipelines/templates/mac-cpu-packaging-steps.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ steps:
2929
- bash: |
3030
mkdir -p $(Build.BinariesDirectory)/onnxruntime-osx-${{ parameters.MacosArch }}-$(OnnxRuntimeVersion)/testdata
3131
cp $(Build.BinariesDirectory)/Release/libcustom_op_library.dylib $(Build.BinariesDirectory)/onnxruntime-osx-${{ parameters.MacosArch }}-$(OnnxRuntimeVersion)/testdata/libcustom_op_library.dylib
32+
# Copy to testdata/testdata so EndToEndTests can find it when running in Debug configuration
33+
mkdir -p $(Build.BinariesDirectory)/testdata/testdata
34+
cp $(Build.BinariesDirectory)/Release/libcustom_op_library.dylib $(Build.BinariesDirectory)/testdata/testdata/libcustom_op_library.dylib
3235
displayName: 'Copy custom op library'
3336
condition: succeeded()
3437

0 commit comments

Comments
 (0)