Repository navigation
fix(ep-tests): use platform-correct ORT lib name from ort_discovery - #823
Merged
Merged
Conversation
Replace 7 hardcoded `libonnxruntime.so` joins in plugin_ort_e2e.rs with `ort_discovery::ort_lib_name()` which returns the correct filename per platform (onnxruntime.dll / libonnxruntime.dylib / libonnxruntime.so). Also fix diag_ort_ep_api_nullcheck to use skip_if_missing! macro so it respects the NXRT_REQUIRE_ORT_TESTS=1 fail-loud gate. Fixes CI failures on Windows ARM64, Windows x86_64, and macOS arm64 lanes. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #823 +/- ##
==========================================
+ Coverage 77.49% 77.75% +0.26%
==========================================
Files 351 352 +1
Lines 141509 146507 +4998
Branches 141509 146507 +4998
==========================================
+ Hits 109666 113923 +4257
- Misses 27443 28120 +677
- Partials 4400 4464 +64
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
✅ Benchmarks — No RegressionComparison of criterion micro-benchmarks: PR head vs merge-base, measured on the same runner in the same job (base first → PR second).
Visual flags: Host infoWhat this cannot catch
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Cherry-pick of commit
dd6ab807fwhich missed the #762 merge window by 30 minutes and is stranded on the already-merged branch.This fixes CURRENTLY-RED lanes on main:
The root cause: 7 hardcoded
libonnxruntime.sojoins inplugin_ort_e2e.rsthat fail on Windows (onnxruntime.dll) and macOS (libonnxruntime.dylib).Fix: Route all ORT library path construction through
ort_discovery::ort_lib_name()which returns the correct platform-specific filename. Also switchesdiag_ort_ep_api_nullcheckto use theskip_if_missing!macro.Verification (Linux x86_64):
cargo test -p onnx-runtime-ep-cpu-plugin --no-fail-fast: 24 passed, 0 failed, 0 ignoredcargo clippy -p onnx-runtime-ep-cpu-plugin --all-targets -- -D warnings: cleanort_discovery.rsWindows/macOS correctness is BY CONSTRUCTION (via
ort_lib_name()returning the right filename percfg!(target_os)) and must be confirmed by CI — we have no such hardware in this environment.Original commit:
dd6ab807fon branchsquad/ep-plugin-parity-cuda(PR #762, merged 2026-08-12T15:10:54Z; commit dated 30 min after merge).