GPU Standalone: support build with ONNXRuntime

Author: davidrohr

Common/ML/CMakeLists.txt

@@ -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::GPUCommon onnxruntime::onnxruntime)
 
 # Pass ORT variables as a preprocessor definition
 target_compile_definitions(${targetName} PRIVATE

Common/ML/include/ML/OrtInterface.h

@@ -25,7 +25,7 @@
 #include <unordered_map>
 
 // O2 includes
-#include "Framework/Logger.h"
+#include "GPUCommonLogger.h"
 
 namespace Ort
 {

GPU/GPUTracking/Base/cuda/CMakeLists.txt

@@ -121,12 +121,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
       ${CMAKE_SOURCE_DIR}/DataFormats/Reconstruction/src
       ${CMAKE_CURRENT_SOURCE_DIR}
     TARGETVARNAME targetName)
-
-  target_compile_definitions(${targetName} PRIVATE
-    GPUCA_HAS_ONNX=1
-    $<$<BOOL:${ORT_CUDA_BUILD}>:ORT_CUDA_BUILD>
-    $<$<BOOL:${ORT_TENSORRT_BUILD}>:ORT_TENSORRT_BUILD>)
-
   install(FILES ${HDRS} DESTINATION include/GPU)
 endif()
 
@@ -141,6 +135,12 @@ endif()
 
 target_compile_definitions(${targetName} PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
 
+if (onnxruntime_FOUND)
+  target_compile_definitions(${targetName} PRIVATE
+                                           $<$<BOOL:${ORT_CUDA_BUILD}>:ORT_CUDA_BUILD>
+                                           $<$<BOOL:${ORT_TENSORRT_BUILD}>:ORT_TENSORRT_BUILD>)
+endif()
+
 # Setting target architecture and adding GPU libraries
 target_link_libraries(${targetName} PRIVATE cuda cudart nvrtc)
 set_target_cuda_arch(${targetName})

GPU/GPUTracking/Base/hip/CMakeLists.txt

@@ -170,11 +170,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
       ${GPUCA_HIP_SOURCE_DIR}
     TARGETVARNAME targetName)
 
-  target_compile_definitions(${targetName} PRIVATE
-    GPUCA_HAS_ONNX=1
-    $<$<BOOL:${ORT_ROCM_BUILD}>:ORT_ROCM_BUILD>
-    $<$<BOOL:${ORT_MIGRAPHX_BUILD}>:ORT_MIGRAPHX_BUILD>)
-
   install(FILES ${HDRS} DESTINATION include/GPU)
 
 #  o2_add_test(GPUsortHIP NAME test_GPUsortHIP
@@ -195,6 +190,12 @@ endif()
 
 target_compile_definitions(${targetName} PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
 
+if (onnxruntime_FOUND)
+  target_compile_definitions(${targetName} PRIVATE
+                                           $<$<BOOL:${ORT_ROCM_BUILD}>:ORT_ROCM_BUILD>
+                                           $<$<BOOL:${ORT_MIGRAPHX_BUILD}>:ORT_MIGRAPHX_BUILD>)
+endif()
+
 add_library(${MODULE}_CXX OBJECT ${SRCS_CXX}) # Adding a C++ library for the .cxx code of the HIP library, such that it does not link to HIP libraries, and CMake HIP Language doesn't add HIP compile flags.
 target_compile_definitions(${MODULE}_CXX PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,COMPILE_DEFINITIONS>)
 target_include_directories(${MODULE}_CXX PRIVATE $<TARGET_PROPERTY:O2::GPUTracking,INCLUDE_DIRECTORIES>)

GPU/GPUTracking/CMakeLists.txt

@@ -200,7 +200,7 @@ set(SRCS_NO_CINT ${SRCS_NO_CINT}
     Refit/GPUTrackingRefitKernel.cxx
     Merger/GPUTPCGMO2Output.cxx)
 
-if(NOT ALIGPU_BUILD_TYPE STREQUAL "Standalone")
+if(onnxruntime_FOUND)
   list(APPEND SRCS_NO_CINT TPCClusterFinder/GPUTPCNNClusterizerKernels.cxx TPCClusterFinder/GPUTPCNNClusterizer.cxx TPCClusterFinder/GPUTPCNNClusterizerHost.cxx)
 endif()
 
@@ -343,15 +343,14 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
                                        O2::DetectorsRaw
                                        O2::Steer
                                        O2::ML
-                 PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
                  PUBLIC_INCLUDE_DIRECTORIES ${INCDIRS}
                  SOURCES ${SRCS} ${SRCS_NO_CINT} ${SRCS_NO_H})
 
   target_include_directories(
     ${targetName}
     PRIVATE $<TARGET_PROPERTY:O2::Framework,INTERFACE_INCLUDE_DIRECTORIES>)
 
-  target_compile_definitions(${targetName} PRIVATE GPUCA_O2_LIB GPUCA_TPC_GEOMETRY_O2 GPUCA_HAS_ONNX=1)
+  target_compile_definitions(${targetName} PRIVATE GPUCA_O2_LIB GPUCA_TPC_GEOMETRY_O2)
 
   o2_target_root_dictionary(${MODULE}
                             HEADERS ${HDRS_CINT_O2} ${HDRS_CINT_O2_ADDITIONAL}
@@ -421,6 +420,11 @@ target_link_libraries(${targetName} PRIVATE TBB::tbb)
 
 target_compile_options(${targetName} PRIVATE -Wno-instantiation-after-specialization)
 
+if (onnxruntime_FOUND)
+  target_compile_definitions(${targetName} PRIVATE GPUCA_HAS_ONNX=1)
+  target_link_libraries(${targetName} PRIVATE onnxruntime::onnxruntime)
+endif()
+
 # Add CMake recipes for GPU Tracking librararies
 if(CUDA_ENABLED OR OPENCL_ENABLED OR HIP_ENABLED)
   if(CMAKE_SYSTEM_NAME MATCHES Darwin)

GPU/GPUTracking/Standalone/CMakeLists.txt

@@ -121,11 +121,25 @@ else()
 endif()
 
 # Detect GPU Backends
-find_package(O2GPU)
+find_package(O2GPU REQUIRED)
+
+if(GPUCA_CONFIG_ONNX)
+  find_package(onnxruntime REQUIRED)
+  if(CUDA_ENABLED AND NOT DEFINED ORT_CUDA_BUILD)
+    set(ORT_CUDA_BUILD ON)
+  elseif(HIP_ENABLED AND NOT DEFINED ORT_ROCM_BUILD)
+    set(ORT_ROCM_BUILD ON)
+  endif()
+else()
+  set(onnxruntime_FOUND OFF)
+endif()
 
 # Create main targets
 add_subdirectory(../../ GPU)
-add_library(standalone_support SHARED ${O2_DIR}/Common/Field/src/MagFieldFast.cxx
+add_library(standalone_support SHARED
+            ${O2_DIR}/Common/Field/src/MagFieldFast.cxx
+            ${O2_DIR}/Common/ML/src/OrtInterface.cxx
+            ${O2_DIR}/Common/Utils/src/StringUtils.cxx
             ${O2_DIR}/DataFormats/Detectors/TPC/src/CompressedClusters.cxx
             ${O2_DIR}/DataFormats/Reconstruction/src/TrackParametrization.cxx
             ${O2_DIR}/DataFormats/Reconstruction/src/TrackParametrizationWithError.cxx
@@ -150,6 +164,7 @@ target_include_directories(standalone_support PUBLIC
                            ${O2_DIR}/Common/Constants/include
                            ${O2_DIR}/Common/MathUtils/include
                            ${O2_DIR}/Common/Utils/include
+                           ${O2_DIR}/Common/ML/include
                            ${O2_DIR}/DataFormats/common/include
                            ${O2_DIR}/DataFormats/Detectors/Common/include
                            ${O2_DIR}/DataFormats/Detectors/ITSMFT/common/include
@@ -210,6 +225,10 @@ if(GPUCA_CONFIG_ROOT)
                         ROOT::Tree)
 endif()
 
+if(GPUCA_CONFIG_ONNX)
+  target_link_libraries(standalone_support PRIVATE onnxruntime::onnxruntime)
+endif()
+
 if (GPUCA_BUILD_DEBUG_SANITIZE AND CMAKE_CXX_COMPILER MATCHES "clang\\+\\+")
   execute_process(COMMAND ${CMAKE_CXX_COMPILER} -print-file-name=libclang_rt.asan-x86_64.so OUTPUT_VARIABLE CLANG_ASAN_SO_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
   get_filename_component(CLANG_ASAN_SO_PATH "${CLANG_ASAN_SO_PATH}" DIRECTORY)

GPU/GPUTracking/Standalone/cmake/config.cmake

@@ -18,6 +18,7 @@ set(ENABLE_OPENCL AUTO)
 set(GPUCA_CONFIG_VC 1)
 set(GPUCA_CONFIG_FMT 1)
 set(GPUCA_CONFIG_ROOT 1)
+set(GPUCA_CONFIG_ONNX 0)
 set(GPUCA_BUILD_EVENT_DISPLAY 1)
 set(GPUCA_BUILD_EVENT_DISPLAY_FREETYPE 1)
 set(GPUCA_BUILD_EVENT_DISPLAY_VULKAN 1)

GPU/GPUTracking/Standalone/cmake/prepare.sh

@@ -11,6 +11,6 @@ else
 fi
 eval "`alienv shell-helper`"
 # alienv load O2/latest
-for i in Vc boost fmt CMake ms_gsl Clang ninja TBB ROOT; do
+for i in Vc boost fmt CMake ms_gsl Clang ninja TBB ROOT ONNXRuntime; do
   source sw/$ALIARCH/$i/latest/etc/profile.d/init.sh
 done

GPU/GPUTracking/cmake/kernel_helpers.cmake

@@ -174,15 +174,13 @@ function(o2_gpu_kernel_add_parameter)
   list(LENGTH ARGV n)
   math(EXPR n "${n} - 1")
   foreach(i RANGE 0 ${n})
-    message(STATUS "Adding ${ARGV${i}}")
     set_property(TARGET O2_GPU_KERNELS APPEND PROPERTY O2_GPU_KERNEL_PARAMS "${ARGV${i}}")
   endforeach()
 endfunction()
 function(o2_gpu_kernel_add_string_parameter)
   list(LENGTH ARGV n)
   math(EXPR n "${n} - 1")
   foreach(i RANGE 0 ${n})
-    message(STATUS "Adding ${ARGV${i}}")
     set_property(TARGET O2_GPU_KERNELS APPEND PROPERTY O2_GPU_KERNEL_STRING_PARAMS "${ARGV${i}}")
   endforeach()
 endfunction()