Skip to content

ONNX: Use CMake defines not env variables #14182

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 1 commit into from
Apr 14, 2025
Merged

ONNX: Use CMake defines not env variables #14182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions Common/ML/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
32 changes: 13 additions & 19 deletions Common/ML/src/OrtInterface.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down