Fixing build flags

Author: ChSonnabend

Common/ML/src/OrtInterface.cxx

@@ -139,7 +139,7 @@ void OrtModel::initSession()
 
 void OrtModel::memoryOnDevice(int32_t deviceIndex)
 {
-#if (defined(ORT_ROCM_BUILD) && ORT_ROCM_BUILD == 1) || (defined(ORT_MIGRAPHX_BUILD) && ORT_MIGRAPHX_BUILD == 1) || (defined(ORT_CUDA_BUILD) && ORT_CUDA_BUILD == 1)
+#if (defined(ORT_ROCM_BUILD) || defined(ORT_MIGRAPHX_BUILD) || defined(ORT_CUDA_BUILD) || defined(ORT_TENSORRT_BUILD))
   if (deviceIndex >= 0) {
     (pImplOrt->runOptions).AddConfigEntry("disable_synchronize_execution_providers", "1");
     (pImplOrt->sessionOptions).AddConfigEntry("session.use_device_allocator_for_initializers", "1"); // See kOrtSessionOptionsUseDeviceAllocatorForInitializers, https://github.com/microsoft/onnxruntime/blob/main/include/onnxruntime/core/session/onnxruntime_session_options_config_keys.h

GPU/GPUTracking/Base/cuda/CMakeLists.txt

@@ -124,8 +124,8 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
 
   target_compile_definitions(${targetName} PRIVATE
     GPUCA_HAS_ONNX=1
-    ORT_CUDA_BUILD=$<BOOL:${ORT_CUDA_BUILD}>
-    ORT_TENSORRT_BUILD=$<BOOL:${ORT_TENSORRT_BUILD}>)
+    $<$<BOOL:${ORT_CUDA_BUILD}>:ORT_CUDA_BUILD>
+    $<$<BOOL:${ORT_TENSORRT_BUILD}>:ORT_TENSORRT_BUILD>)
 
   install(FILES ${HDRS} DESTINATION include/GPU)
 endif()

GPU/GPUTracking/Base/hip/CMakeLists.txt

@@ -172,8 +172,8 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
 
   target_compile_definitions(${targetName} PRIVATE
     GPUCA_HAS_ONNX=1
-    ORT_ROCM_BUILD=$<BOOL:${ORT_ROCM_BUILD}>
-    ORT_MIGRAPHX_BUILD=$<BOOL:${ORT_MIGRAPHX_BUILD}>)
+    $<$<BOOL:${ORT_ROCM_BUILD}>:ORT_ROCM_BUILD>
+    $<$<BOOL:${ORT_MIGRAPHX_BUILD}>:ORT_MIGRAPHX_BUILD>)
 
   install(FILES ${HDRS} DESTINATION include/GPU)