-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Rework --enable_generic_interface and add tests #24552
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
adrianlizarraga
merged 19 commits into
main
from
adrianl/fix-qnn-use-of-generic-interface-flag
Apr 30, 2025
Merged
Rework --enable_generic_interface and add tests #24552
adrianlizarraga
merged 19 commits into
main
from
adrianl/fix-qnn-use-of-generic-interface-flag
Apr 30, 2025
Conversation
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
karim-vad
reviewed
Apr 28, 2025
tools/ci_build/github/azure-pipelines/win-qnn-arm64-ci-pipeline.yml
Outdated
Show resolved
Hide resolved
karim-vad
reviewed
Apr 29, 2025
karim-vad
reviewed
Apr 29, 2025
…but not full EP) is built fails
adrianlizarraga
commented
Apr 29, 2025
adrianlizarraga
commented
Apr 29, 2025
adrianlizarraga
commented
Apr 29, 2025
adrianlizarraga
commented
Apr 29, 2025
adrianlizarraga
commented
Apr 29, 2025
tools/ci_build/github/azure-pipelines/win-qnn-arm64-ci-pipeline.yml
Outdated
Show resolved
Hide resolved
adrianlizarraga
commented
Apr 29, 2025
tools/ci_build/github/azure-pipelines/win-qnn-arm64-ci-pipeline.yml
Outdated
Show resolved
Hide resolved
adrianlizarraga
commented
Apr 29, 2025
tools/ci_build/github/azure-pipelines/win-qnn-arm64-ci-pipeline.yml
Outdated
Show resolved
Hide resolved
karim-vad
reviewed
Apr 29, 2025
jywu-msft
approved these changes
Apr 30, 2025
karim-vad
approved these changes
Apr 30, 2025
vraspar
pushed a commit
that referenced
this pull request
May 1, 2025
- Introduces `USE_<EP>_PROVIDER_INTERFACE` pre-processor macros that indicate when an EP interface is enabled but the full EP is not being compiled. - Previously, the CMake configuration turned on `USE_<EP>` for both use cases. This prevented tests from determining whether the full EP or only the interface was available, which caused test failures. It also turned on all EP code paths in core ORT code at the same time, which caused compilation and logic errors. - Adds the new NV EP to list of EPs whose interface is enabled with ORT is built with `--enable_generic_interface` - Updates the Windows Arm64 QNN CI Pipeline to actually use the `--enable_generic_interface` flag. - Previously, It was not actually being passed to the build command, so no unit tests were being run with the flag enabled. - Adds unit tests to check that adding an EP to the session options fails when only the generic interface (but not the full EP) is built. - Windows ARM64 QNN CI Pipeline: - Builds ORT with `--use_qnn --enable_generic_interface` and runs all normal QNN EP unit tests. - Builds ORT with `--use_qnn --enable_generic_interface` and runs new unit tests that try to add the following EPs to the session options (expect failure): OpenVINO, CUDA, NV, TensorRT, VitisAI - Build and Test OpenVINO EP (AlamLinux8, Py3.12) / build_test_pipeline: - Builds ORT with `--use_openvino --enable_generic_interface` and runs all normal OpenVINO EP unit tests. - Builds ORT with `--use_openvino --enable_generic_interface` and runs new unit tests that try to add the following EPs to the session options (expect failure): QNN, CUDA, NV, TensorRT, VitisAI - windows_x64_release_ep_generic_interface - Builds ORT with `--enable_generic_interface` and now runs CPU EP unit tests (didn't previously). Fix use of `--enable_generic_interface` and make sure tests actually run.
jywu-msft
pushed a commit
that referenced
this pull request
May 1, 2025
### Description Cherry pick the following into [rel-1.22.0](https://github.com/microsoft/onnxruntime/tree/rel-1.22.0) - (#24491) - (#24509) - (#24564) - (#24574) - (#24582) - (#24584) - (#24568) - (#24587) - (#24563) - (#24592) - (#24526) - (#24552) - (#24588) - (#24605) - (#24606) --------- Co-authored-by: Jing Fang <[email protected]> Co-authored-by: Tianlei Wu <[email protected]> Co-authored-by: Baiju Meswani <[email protected]> Co-authored-by: Scott McKay <[email protected]> Co-authored-by: Mark Schofield <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Edward Chen <[email protected]> Co-authored-by: Ashwath Shankarnarayan <[email protected]> Co-authored-by: saurabh <[email protected]> Co-authored-by: Adrian Lizarraga <[email protected]> Co-authored-by: Hector Li <[email protected]>
ankitm3k
pushed a commit
to intel/onnxruntime
that referenced
this pull request
May 12, 2025
### Description - Introduces `USE_<EP>_PROVIDER_INTERFACE` pre-processor macros that indicate when an EP interface is enabled but the full EP is not being compiled. - Previously, the CMake configuration turned on `USE_<EP>` for both use cases. This prevented tests from determining whether the full EP or only the interface was available, which caused test failures. It also turned on all EP code paths in core ORT code at the same time, which caused compilation and logic errors. - Adds the new NV EP to list of EPs whose interface is enabled with ORT is built with `--enable_generic_interface` - Updates the Windows Arm64 QNN CI Pipeline to actually use the `--enable_generic_interface` flag. - Previously, It was not actually being passed to the build command, so no unit tests were being run with the flag enabled. - Adds unit tests to check that adding an EP to the session options fails when only the generic interface (but not the full EP) is built. #### CI Pipelines that use --enable_generic_interface - Windows ARM64 QNN CI Pipeline: - Builds ORT with `--use_qnn --enable_generic_interface` and runs all normal QNN EP unit tests. - Builds ORT with `--use_qnn --enable_generic_interface` and runs new unit tests that try to add the following EPs to the session options (expect failure): OpenVINO, CUDA, NV, TensorRT, VitisAI - Build and Test OpenVINO EP (AlamLinux8, Py3.12) / build_test_pipeline: - Builds ORT with `--use_openvino --enable_generic_interface` and runs all normal OpenVINO EP unit tests. - Builds ORT with `--use_openvino --enable_generic_interface` and runs new unit tests that try to add the following EPs to the session options (expect failure): QNN, CUDA, NV, TensorRT, VitisAI - windows_x64_release_ep_generic_interface - Builds ORT with `--enable_generic_interface` and now runs CPU EP unit tests (didn't previously). ### Motivation and Context Fix use of `--enable_generic_interface` and make sure tests actually run.
This PR has been included in the |
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.
Description
USE_<EP>_PROVIDER_INTERFACE
pre-processor macros that indicate when an EP interface is enabled but the full EP is not being compiled.USE_<EP>
for both use cases. This prevented tests from determining whether the full EP or only the interface was available, which caused test failures. It also turned on all EP code paths in core ORT code at the same time, which caused compilation and logic errors.--enable_generic_interface
--enable_generic_interface
flag.CI Pipelines that use --enable_generic_interface
--use_qnn --enable_generic_interface
and runs all normal QNN EP unit tests.--use_qnn --enable_generic_interface
and runs new unit tests that try to add the following EPs to the session options (expect failure): OpenVINO, CUDA, NV, TensorRT, VitisAI--use_openvino --enable_generic_interface
and runs all normal OpenVINO EP unit tests.--use_openvino --enable_generic_interface
and runs new unit tests that try to add the following EPs to the session options (expect failure): QNN, CUDA, NV, TensorRT, VitisAI--enable_generic_interface
and now runs CPU EP unit tests (didn't previously).Motivation and Context
Fix use of
--enable_generic_interface
and make sure tests actually run.