Skip to content

[SYCL][UR][CUDA] Fix CMake CUPTI config #17457

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
merged 2 commits into from
Mar 17, 2025
Merged

[SYCL][UR][CUDA] Fix CMake CUPTI config #17457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f92957
[SYCL][UR][CUDA] Fix CMake CUPTI config
rafbiels Mar 13, 2025
f83d635
Merge remote-tracking branch 'origin/sycl' into fix-cmake-cupti
rafbiels Mar 14, 2025
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
37 changes: 35 additions & 2 deletions sycl/tools/sycl-trace/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,48 @@ if(SYCL_BUILD_BACKEND_CUDA)

target_compile_definitions(cuda_trace_collector PRIVATE USE_UR_CUDA)

# CUDAToolkit_CUPTI_INCLUDE_DIR is provided by FindCUDAToolkit since CMake
# 3.24, but we support versions back to 3.20. Find it if not found already.
if (NOT CUDAToolkit_CUPTI_INCLUDE_DIR)
find_path(CUDAToolkit_CUPTI_INCLUDE_DIR cupti.h PATHS
"${CUDAToolkit_ROOT_DIR}/extras/CUPTI/include"
${CUDAToolkit_INCLUDE_DIRS}
PATH_SUFFIXES "../extras/CUPTI/include"
"../../../extras/CUPTI/include"
REQUIRED
NO_DEFAULT_PATH)
endif()

target_include_directories(cuda_trace_collector
PRIVATE
${CUDAToolkit_cupti_INCLUDE_DIR}
${CUDAToolkit_CUPTI_INCLUDE_DIR}
)

# FindCUDATookit fails to find CUPTI in CUDA installations from runfile.
# See https://gitlab.kitware.com/cmake/cmake/-/issues/26770
# Retry the search with extra paths if not found already.
if (NOT CUDA_cupti_LIBRARY)
get_filename_component(CUDAToolkit_LIBRARY_DIR ${CUDA_CUDART} DIRECTORY ABSOLUTE)
find_library(CUDA_cupti_LIBRARY
NAMES cupti
HINTS ${CUDAToolkit_ROOT}
${CUDAToolkit_ROOT}/lib64
${CUDAToolkit_ROOT}/lib
${CUDAToolkit_LIBRARY_DIR}
${CUDAToolkit_LIBRARY_DIR}/..
${CUDAToolkit_LIBRARY_DIR}/../../..
${CUDAToolkit_LIBRARY_DIR}/../../../../..
ENV CUDA_PATH
PATH_SUFFIXES lib64 lib/x64 lib
extras/CUPTI/lib64/
extras/CUPTI/lib/
REQUIRED
)
endif()
target_link_libraries(cuda_trace_collector
PRIVATE
cudadrv
${CUDAToolkit_cupti_LIBRARY}
${CUDA_cupti_LIBRARY}
)

find_path(GEN_CUDA_META_H_DIR generated_cuda_meta.h PATHS
Expand Down
15 changes: 14 additions & 1 deletion unified-runtime/source/adapters/cuda/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,22 @@ if (UR_ENABLE_TRACING AND UNIX)
XPTI_ENABLE_INSTRUMENTATION
XPTI_STATIC_LIBRARY
)

# CUDAToolkit_CUPTI_INCLUDE_DIR is provided by FindCUDAToolkit since CMake
# 3.24, but we support versions back to 3.20. Find it if not found already.
if (NOT CUDAToolkit_CUPTI_INCLUDE_DIR)
find_path(CUDAToolkit_CUPTI_INCLUDE_DIR cupti.h PATHS
"${CUDAToolkit_ROOT_DIR}/extras/CUPTI/include"
${CUDAToolkit_INCLUDE_DIRS}
PATH_SUFFIXES "../extras/CUPTI/include"
"../../../extras/CUPTI/include"
REQUIRED
NO_DEFAULT_PATH)
endif()

target_include_directories(${TARGET_NAME} PRIVATE
${XPTI_INCLUDES}
${CUDAToolkit_cupti_INCLUDE_DIR}
${CUDAToolkit_CUPTI_INCLUDE_DIR}
)
target_sources(${TARGET_NAME} PRIVATE ${XPTI_PROXY_SRC})
endif()
Expand Down
Loading