Merge branch 'AliceO2Group:dev' into new_geometry

Author: pkurash

Common/Constants/include/CommonConstants/PhysicsConstants.h

@@ -100,7 +100,10 @@ enum Pdg {
   kLambda1520_Py = 102134,
   kK1_1270_0 = 10313,
   kK1_1270Plus = 10323,
-  kCDeuteron = 2010010020
+  kCDeuteron = 2010010020,
+  kXi1820Minus = 123314,
+  kXi1820Zero = 123324,
+  kOmega2012Minus = 123334
 };
 
 /// \brief Declarations of masses for additional particles
@@ -172,6 +175,9 @@ GPUglobalconstexpr() double MassLambda1520_Py = 1.5195;
 GPUglobalconstexpr() double MassK1_1270_0 = 1.253;
 GPUglobalconstexpr() double MassK1_1270Plus = 1.272;
 GPUglobalconstexpr() double MassCDeuteron = 3.226;
+GPUglobalconstexpr() double MassXi1820Minus = 1.8234;
+GPUglobalconstexpr() double MassXi1820Zero = 1.8234;
+GPUglobalconstexpr() double MassOmega2012Minus = 2.0125;
 
 /// \brief Declarations of masses for particles in ROOT PDG_t
 GPUglobalconstexpr() double MassDown = 0.00467;

Common/Constants/include/CommonConstants/make_pdg_header.py

@@ -157,6 +157,9 @@ class Pdg(Enum):
     kK1_1270_0 = 10313
     kK1_1270Plus = 10323
     kCDeuteron = 2010010020
+    kXi1820Minus = 123314  # Xi(1820)-, not in ROOT/PYTHIA PDG_t (see O2DatabasePDG.h)
+    kXi1820Zero = 123324  # Xi(1820)0, not in ROOT/PYTHIA PDG_t (see O2DatabasePDG.h)
+    kOmega2012Minus = 123334  # Omega(2012)-, not in ROOT/PYTHIA PDG_t (see O2DatabasePDG.h)
 
 
 dbPdg = o2.O2DatabasePDG

Common/ML/CMakeLists.txt

@@ -20,3 +20,52 @@ target_compile_definitions(${targetName} PRIVATE
     $<$<BOOL:${ORT_CUDA_BUILD}>:ORT_CUDA_BUILD>
     $<$<BOOL:${ORT_MIGRAPHX_BUILD}>:ORT_MIGRAPHX_BUILD>
     $<$<BOOL:${ORT_TENSORRT_BUILD}>:ORT_TENSORRT_BUILD>)
+
+if(BUILD_TESTING)
+    set(ONNXRUNTIME_INFERENCE_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test/onnxruntime-inference)
+
+    o2_add_executable(onnxruntime-ep-inference
+                      SOURCES ${ONNXRUNTIME_INFERENCE_TEST_DIR}/onnxruntime_ep_inference.cxx
+                      COMPONENT_NAME ML
+                      IS_TEST
+                      NO_INSTALL
+                      TARGETVARNAME onnxruntimeInferenceTestTarget
+                      PUBLIC_LINK_LIBRARIES onnxruntime::onnxruntime)
+    target_compile_features(${onnxruntimeInferenceTestTarget} PRIVATE cxx_std_17)
+    target_compile_definitions(${onnxruntimeInferenceTestTarget} PRIVATE
+        $<$<BOOL:${ORT_CUDA_BUILD}>:ORT_CUDA_BUILD>
+        $<$<BOOL:${ORT_MIGRAPHX_BUILD}>:ORT_MIGRAPHX_BUILD>
+        $<$<BOOL:${ORT_TENSORRT_BUILD}>:ORT_TENSORRT_BUILD>)
+
+    set(ONNXRUNTIME_INFERENCE_INSTALL_DIR share/test/onnxruntime-inference)
+    install(TARGETS ${onnxruntimeInferenceTestTarget}
+            RUNTIME DESTINATION ${ONNXRUNTIME_INFERENCE_INSTALL_DIR})
+    install(PROGRAMS
+            ${ONNXRUNTIME_INFERENCE_TEST_DIR}/run-ci-onnxruntime-inference-test.sh
+            ${ONNXRUNTIME_INFERENCE_TEST_DIR}/run-onnxruntime-all-eps.sh
+            ${ONNXRUNTIME_INFERENCE_TEST_DIR}/run-onnxruntime-cpu.sh
+            ${ONNXRUNTIME_INFERENCE_TEST_DIR}/run-onnxruntime-cuda.sh
+            ${ONNXRUNTIME_INFERENCE_TEST_DIR}/run-onnxruntime-migraphx.sh
+            ${ONNXRUNTIME_INFERENCE_TEST_DIR}/run-onnxruntime-tensorrt.sh
+            DESTINATION ${ONNXRUNTIME_INFERENCE_INSTALL_DIR})
+    install(FILES ${ONNXRUNTIME_INFERENCE_TEST_DIR}/net.onnx
+            DESTINATION ${ONNXRUNTIME_INFERENCE_INSTALL_DIR})
+
+    foreach(provider CUDA MIGRAPHX TENSORRT)
+        set(ONNXRUNTIME_INFERENCE_TEST_${provider} 0)
+        if(ORT_${provider}_BUILD)
+            set(ONNXRUNTIME_INFERENCE_TEST_${provider} 1)
+        endif()
+    endforeach()
+
+    o2_add_test_command(NAME Common/ML/onnxruntime-inference
+                        COMMAND ${ONNXRUNTIME_INFERENCE_TEST_DIR}/run-onnxruntime-all-eps.sh
+                        COMMAND_LINE_ARGS ${ONNXRUNTIME_INFERENCE_TEST_DIR}/net.onnx
+                        ENVIRONMENT
+                          "ONNXRUNTIME_INFERENCE_TEST_BINARY=$<TARGET_FILE:${onnxruntimeInferenceTestTarget}>"
+                          "ORT_CUDA_BUILD=${ONNXRUNTIME_INFERENCE_TEST_CUDA}"
+                          "ORT_MIGRAPHX_BUILD=${ONNXRUNTIME_INFERENCE_TEST_MIGRAPHX}"
+                          "ORT_TENSORRT_BUILD=${ONNXRUNTIME_INFERENCE_TEST_TENSORRT}"
+                        LABELS ml onnxruntime gpu
+                        TIMEOUT 300)
+endif()

Common/ML/test/onnxruntime-inference/CMakeLists.txt

@@ -0,0 +1,35 @@
+# Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+# See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+# All rights not expressly granted are reserved.
+#
+# This software is distributed under the terms of the GNU General Public
+# License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+#
+# In applying this license CERN does not waive the privileges and immunities
+# granted to it by virtue of its status as an Intergovernmental Organization
+# or submit itself to any jurisdiction.
+
+cmake_minimum_required(VERSION 3.16)
+project(onnxruntime_inference_test LANGUAGES CXX)
+
+find_package(onnxruntime CONFIG REQUIRED)
+
+add_executable(onnxruntime-ep-inference onnxruntime_ep_inference.cxx)
+target_compile_features(onnxruntime-ep-inference PRIVATE cxx_std_17)
+target_link_libraries(onnxruntime-ep-inference PRIVATE onnxruntime::onnxruntime)
+target_compile_definitions(onnxruntime-ep-inference PRIVATE
+  $<$<BOOL:${ORT_CUDA_BUILD}>:ORT_CUDA_BUILD>
+  $<$<BOOL:${ORT_MIGRAPHX_BUILD}>:ORT_MIGRAPHX_BUILD>
+  $<$<BOOL:${ORT_TENSORRT_BUILD}>:ORT_TENSORRT_BUILD>)
+
+install(TARGETS onnxruntime-ep-inference RUNTIME DESTINATION bin)
+install(PROGRAMS
+  run-onnxruntime-all-eps.sh
+  run-onnxruntime-cpu.sh
+  run-onnxruntime-cuda.sh
+  run-onnxruntime-migraphx.sh
+  run-onnxruntime-tensorrt.sh
+  run-local-onnxruntime-inference-test.sh
+  run-ci-onnxruntime-inference-test.sh
+  DESTINATION bin)
+install(FILES net.onnx DESTINATION test/onnxruntime-inference)