ONNX: Use CMake defines not env variables

Author: davidrohr

Common/ML/CMakeLists.txt

@@ -10,17 +10,17 @@
 # or submit itself to any jurisdiction.
 
 # Pass ORT variables as a preprocessor definition
-if(DEFINED ENV{ORT_ROCM_BUILD})
-    add_compile_definitions(ORT_ROCM_BUILD=$ENV{ORT_ROCM_BUILD})
+if(ORT_ROCM_BUILD)
+    add_compile_definitions(ORT_ROCM_BUILD=1)
 endif()
-if(DEFINED ENV{ORT_CUDA_BUILD})
-    add_compile_definitions(ORT_CUDA_BUILD=$ENV{ORT_CUDA_BUILD})
+if(ORT_CUDA_BUILD)
+    add_compile_definitions(ORT_CUDA_BUILD=1)
 endif()
-if(DEFINED ENV{ORT_MIGRAPHX_BUILD})
-    add_compile_definitions(ORT_MIGRAPHX_BUILD=$ENV{ORT_MIGRAPHX_BUILD})
+if(ORT_MIGRAPHX_BUILD)
+    add_compile_definitions(ORT_MIGRAPHX_BUILD=1)
 endif()
-if(DEFINED ENV{ORT_TENSORRT_BUILD})
-    add_compile_definitions(ORT_TENSORRT_BUILD=$ENV{ORT_TENSORRT_BUILD})
+if(ORT_TENSORRT_BUILD)
+    add_compile_definitions(ORT_TENSORRT_BUILD=1)
 endif()
 
 o2_add_library(ML

Common/ML/src/OrtInterface.cxx

@@ -59,29 +59,23 @@ void OrtModel::reset(std::unordered_map<std::string, std::string> optionsMap)
 
     std::string dev_mem_str = "Hip";
 #if defined(ORT_ROCM_BUILD)
-#if ORT_ROCM_BUILD == 1
-  if (device == "ROCM") {
-    Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_ROCM(pImplOrt->sessionOptions, deviceId));
-    LOG(info) << "(ORT) ROCM execution provider set";
-  }
-#endif
+    if (device == "ROCM") {
+      Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_ROCM(pImplOrt->sessionOptions, deviceId));
+      LOG(info) << "(ORT) ROCM execution provider set";
+    }
 #endif
 #if defined(ORT_MIGRAPHX_BUILD)
-#if ORT_MIGRAPHX_BUILD == 1
-  if (device == "MIGRAPHX") {
-    Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_MIGraphX(pImplOrt->sessionOptions, deviceId));
-    LOG(info) << "(ORT) MIGraphX execution provider set";
-  }
-#endif
+    if (device == "MIGRAPHX") {
+      Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_MIGraphX(pImplOrt->sessionOptions, deviceId));
+      LOG(info) << "(ORT) MIGraphX execution provider set";
+    }
 #endif
 #if defined(ORT_CUDA_BUILD)
-#if ORT_CUDA_BUILD == 1
-  if (device == "CUDA") {
-    Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CUDA(pImplOrt->sessionOptions, deviceId));
-    LOG(info) << "(ORT) CUDA execution provider set";
-    dev_mem_str = "Cuda";
-  }
-#endif
+    if (device == "CUDA") {
+      Ort::ThrowOnError(OrtSessionOptionsAppendExecutionProvider_CUDA(pImplOrt->sessionOptions, deviceId));
+      LOG(info) << "(ORT) CUDA execution provider set";
+      dev_mem_str = "Cuda";
+    }
 #endif
 
   if (allocateDeviceMemory) {