Skip to content

CMake: cleanup for ROCm and ONNXRuntime detection #14209

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

Merged
davidrohr merged 2 commits into from
Apr 22, 2025
Merged

CMake: cleanup for ROCm and ONNXRuntime detection #14209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42d99a3
GPU CMake: Set GPU architecture before checking the language, to supp…
davidrohr Apr 22, 2025
b89c640
ONNXRuntime CMake: Use standard ONNXRuntime lowercase library syntax,…
davidrohr Apr 22, 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: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ o2_build_sanity_checks()
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)

include(dependencies/FindONNXRuntime.cmake)

include(O2CheckCXXFeatures)
o2_check_cxx_features()

Expand Down
2 changes: 1 addition & 1 deletion Common/ML/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
o2_add_library(ML
SOURCES src/OrtInterface.cxx
TARGETVARNAME targetName
PRIVATE_LINK_LIBRARIES O2::Framework ONNXRuntime::ONNXRuntime)
PRIVATE_LINK_LIBRARIES O2::Framework onnxruntime::onnxruntime)

# Pass ORT variables as a preprocessor definition
target_compile_definitions(${targetName} PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Base/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
${MODULE}
SOURCES ${SRCS}
PUBLIC_LINK_LIBRARIES O2::GPUTracking O2::ITStrackingCUDA
PRIVATE_LINK_LIBRARIES ONNXRuntime::ONNXRuntime
PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/Detectors/Base/src
${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Base/hip/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
${MODULE}
SOURCES ${SRCS}
PUBLIC_LINK_LIBRARIES O2::GPUTracking O2::ITStrackingHIP
PRIVATE_LINK_LIBRARIES ONNXRuntime::ONNXRuntime
PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/Detectors/Base/src
${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
O2::DetectorsRaw
O2::Steer
O2::ML
PRIVATE_LINK_LIBRARIES ONNXRuntime::ONNXRuntime
PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
PUBLIC_INCLUDE_DIRECTORIES ${INCDIRS}
SOURCES ${SRCS} ${SRCS_NO_CINT} ${SRCS_NO_H})

Expand Down
8 changes: 7 additions & 1 deletion dependencies/FindO2GPU.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ endif()

# ---------------------------------- CUDA ----------------------------------
if(ENABLE_CUDA)
if(CUDA_COMPUTETARGET)
set(CMAKE_CUDA_ARCHITECTURES ${CUDA_COMPUTETARGET} CACHE STRING "" FORCE)
endif()
set(CMAKE_CUDA_STANDARD ${CMAKE_CXX_STANDARD})
set(CMAKE_CUDA_STANDARD_REQUIRED TRUE)
include(CheckLanguage)
Expand Down Expand Up @@ -227,6 +230,9 @@ endif()

# ---------------------------------- HIP ----------------------------------
if(ENABLE_HIP)
if(HIP_AMDGPUTARGET)
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}" CACHE STRING "" FORCE)
endif()
if(NOT "$ENV{CMAKE_PREFIX_PATH}" MATCHES "rocm" AND NOT CMAKE_PREFIX_PATH MATCHES "rocm" AND EXISTS "/opt/rocm/lib/cmake/")
list(APPEND CMAKE_PREFIX_PATH "/opt/rocm/lib/cmake")
endif()
Expand Down Expand Up @@ -300,7 +306,7 @@ if(ENABLE_HIP)
endif()
string(REGEX REPLACE "(gfx1[0-9]+;?)" "" CMAKE_HIP_ARCHITECTURES "${CMAKE_HIP_ARCHITECTURES}") # ROCm currently doesn’t support integrated graphics
if(HIP_AMDGPUTARGET)
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}") # If GPU build is enforced we override autodetection
set(CMAKE_HIP_ARCHITECTURES "${HIP_AMDGPUTARGET}")
endif()
else()
set(HIP_ENABLED OFF)
Expand Down
23 changes: 0 additions & 23 deletions dependencies/FindONNXRuntime.cmake
View file
Open in desktop

This file was deleted.

3 changes: 3 additions & 0 deletions dependencies/O2Dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ if (NOT TARGET Gandiva::gandiva_shared)
add_library(Gandiva::gandiva_shared ALIAS gandiva_shared)
endif()

find_package(onnxruntime CONFIG)
set_package_properties(onnxruntime PROPERTIES TYPE REQUIRED)

find_package(Vc)
set_package_properties(Vc PROPERTIES TYPE REQUIRED)

Expand Down