Skip to content
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.

Sign up for GitHub

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

build: Use CONFIG mode for onnxruntime #4086

Merged
merged 4 commits into from
Feb 14, 2025
Merged

build: Use CONFIG mode for onnxruntime #4086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2fc9d2
build: Use CONFIG mode for onnxruntime
paulgessinger Feb 12, 2025
a5a9ce0
remove obsolete install directive
paulgessinger Feb 12, 2025
ec9df3a
Merge branch 'main' into build/onnxruntime
kodiakhq[bot] Feb 13, 2025
37ab947
Merge branch 'main' into build/onnxruntime
kodiakhq[bot] Feb 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ if(ACTS_BUILD_PLUGIN_EXATRKX)
endif()
endif()
if(ACTS_BUILD_PLUGIN_ONNX OR ACTS_EXATRKX_ENABLE_ONNX)
find_package(OnnxRuntime ${_acts_onnxruntime_version} REQUIRED)
find_package(onnxruntime ${_acts_onnxruntime_version} CONFIG REQUIRED)
endif()
if(ACTS_BUILD_PLUGIN_EDM4HEP OR ACTS_BUILD_PLUGIN_PODIO)
find_package(podio ${_acts_podio_version} CONFIG)
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Onnx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_include_directories(
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)

target_link_libraries(ActsPluginOnnx PUBLIC ActsCore OnnxRuntime)
target_link_libraries(ActsPluginOnnx PUBLIC ActsCore onnxruntime::onnxruntime)

install(
TARGETS ActsPluginOnnx
Expand Down
2 changes: 1 addition & 1 deletion Plugins/Onnx/include/Acts/Plugins/Onnx/OnnxRuntimeBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <vector>

#include <Eigen/Dense>
#include <onnxruntime_cxx_api.h>
#include <onnxruntime/onnxruntime_cxx_api.h>

namespace Acts {

Expand Down
2 changes: 1 addition & 1 deletion Plugins/Onnx/include/Acts/Plugins/Onnx/SeedClassifier.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

#include <vector>

#include <onnxruntime_cxx_api.h>
#include <onnxruntime/onnxruntime_cxx_api.h>

namespace Acts {

Expand Down
6 changes: 0 additions & 6 deletions cmake/ActsCreatePackageConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,6 @@ install(
DESTINATION ${install_package_config_dir}
)

# install third party FindXXX.cmake files
install(
FILES ${CMAKE_CURRENT_LIST_DIR}/FindOnnxRuntime.cmake
DESTINATION ${install_package_config_dir}/Modules
)

# install target configs for all available components
foreach(_component ${_components})
install(
Expand Down
75 changes: 0 additions & 75 deletions cmake/FindOnnxRuntime.cmake
View file
Open in desktop

This file was deleted.

Loading