Skip to content

GPU CUDA ORT: Fix usage of OrtCUDAProviderOptionsV2 #14215

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 23, 2025
+3 −4
Merged

GPU CUDA ORT: Fix usage of OrtCUDAProviderOptionsV2 #14215

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
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Base/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
${MODULE}
SOURCES ${SRCS}
PUBLIC_LINK_LIBRARIES O2::GPUTracking O2::ITStrackingCUDA
PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/Detectors/Base/src
${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src
Expand All @@ -139,6 +138,7 @@ if (onnxruntime_FOUND)
target_compile_definitions(${targetName} PRIVATE
$<$<BOOL:${ORT_CUDA_BUILD}>:ORT_CUDA_BUILD>
$<$<BOOL:${ORT_TENSORRT_BUILD}>:ORT_TENSORRT_BUILD>)
target_link_libraries(${targetName} PRIVATE onnxruntime::onnxruntime)
endif()

# Setting target architecture and adding GPU libraries
Expand Down
3 changes: 1 addition & 2 deletions GPU/GPUTracking/Base/cuda/GPUReconstructionCUDA.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,8 @@ void GPUReconstructionCUDA::SetONNXGPUStream(Ort::SessionOptions& session_option
// UpdateCUDAProviderOptions(cuda_options, keys.data(), values.data(), keys.size());

// this implicitly sets "has_user_compute_stream"
cuda_options->has_user_compute_stream = 1;
ORTCHK(api->UpdateCUDAProviderOptionsWithValue(cuda_options, "user_compute_stream", mInternals->Streams[stream]));
session_options.AppendExecutionProvider_CUDA_V2(cuda_options);
ORTCHK(api->SessionOptionsAppendExecutionProvider_CUDA_V2(session_options, cuda_options));

// Finally, don't forget to release the provider options
api->ReleaseCUDAProviderOptions(cuda_options);
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Base/hip/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ if(ALIGPU_BUILD_TYPE STREQUAL "O2")
${MODULE}
SOURCES ${SRCS}
PUBLIC_LINK_LIBRARIES O2::GPUTracking O2::ITStrackingHIP
PRIVATE_LINK_LIBRARIES onnxruntime::onnxruntime
PRIVATE_INCLUDE_DIRECTORIES
${CMAKE_SOURCE_DIR}/Detectors/Base/src
${CMAKE_SOURCE_DIR}/Detectors/TRD/base/src
Expand Down Expand Up @@ -194,6 +193,7 @@ if (onnxruntime_FOUND)
target_compile_definitions(${targetName} PRIVATE
$<$<BOOL:${ORT_ROCM_BUILD}>:ORT_ROCM_BUILD>
$<$<BOOL:${ORT_MIGRAPHX_BUILD}>:ORT_MIGRAPHX_BUILD>)
target_link_libraries(${targetName} PRIVATE onnxruntime::onnxruntime)
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.
Expand Down