Skip to content

onnxruntime upstream uses onnxruntime::onnxruntime: Adhere to that and remain compatible with our custom onnxruntime build#12963

Merged
davidrohr merged 3 commits intoAliceO2Group:devfrom
davidrohr:dev_pull_request2
Apr 1, 2024
Merged

onnxruntime upstream uses onnxruntime::onnxruntime: Adhere to that and remain compatible with our custom onnxruntime build#12963
davidrohr merged 3 commits intoAliceO2Group:devfrom
davidrohr:dev_pull_request2

Conversation

@davidrohr
Copy link
Collaborator

Upstream onnxruntime actually creates a CMake target, but with onnxruntime::onnxruntime not with ONNXRuntime::ONNXRuntime as does the hacked cmake recipe in our fork.

This commit changes O2 to use the upstream notation, and in case we use onnxruntime from our recipe not an upstream build, we create an alias to remain compatible for now.

@davidrohr davidrohr requested a review from a team as a code owner March 29, 2024 21:44
@github-actions
Copy link
Contributor

REQUEST FOR PRODUCTION RELEASES:
To request your PR to be included in production software, please add the corresponding labels called "async-" to your PR. Add the labels directly (if you have the permissions) or add a comment of the form (note that labels are separated by a ",")

+async-label <label1>, <label2>, !<label3> ...

This will add <label1> and <label2> and removes <label3>.

The following labels are available
async-2023-pbpb-apass
async-2023-pp-apass1
async-2022-pp-apass6
async-2022-pp-apass4
async-mc
async-data

@davidrohr
Copy link
Collaborator Author

This seems to work as intended:

-- Could NOT find onnxruntime (missing: onnxruntime_DIR)
-- Found ONNXRuntime::ONNXRuntime: /sw/slc7_x86-64/ONNXRuntime/v1.12.1-alice1-local4/lib/libonnxruntime.so  

The upstream version with the normal onnxruntime naming is not found, but then our ALICE version is found: ONNXRuntime::ONNXRuntime

@alibuild
Copy link
Collaborator

Error while checking build/O2/fullCI for 9125714 at 2024-03-31 16:13:

## sw/BUILD/O2-latest/log
c++: error: unrecognized command-line option '--rtlib=compiler-rt'
c++: error: unrecognized command-line option '--rtlib=compiler-rt'

Full log here.

@davidrohr davidrohr merged commit 5a5d73c into AliceO2Group:dev Apr 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants