diff --git a/sycl/cmake/modules/FindCUDACupti.cmake b/sycl/cmake/modules/FindCUDACupti.cmake deleted file mode 100644 index 864a7063f59ab..0000000000000 --- a/sycl/cmake/modules/FindCUDACupti.cmake +++ /dev/null @@ -1,20 +0,0 @@ -macro(find_cuda_cupti_library) -# The following if can be removed when FindCUDA -> FindCUDAToolkit - find_library(CUDA_cupti_LIBRARY - NAMES cupti - HINTS ${CUDA_TOOLKIT_ROOT_DIR} - ENV CUDA_PATH - PATH_SUFFIXES nvidia/current lib64 lib/x64 lib - ../extras/CUPTI/lib64/ - ../extras/CUPTI/lib/ - ) -endmacro() - -macro(find_cuda_cupti_include_dir) - find_path(CUDA_CUPTI_INCLUDE_DIR cupti.h PATHS - "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include" - "${CUDA_INCLUDE_DIRS}/../extras/CUPTI/include" - "${CUDA_INCLUDE_DIRS}" - NO_DEFAULT_PATH) -endmacro() - diff --git a/sycl/doc/GetStartedGuide.md b/sycl/doc/GetStartedGuide.md index 0c594ad6d5101..01b1b9adb417a 100644 --- a/sycl/doc/GetStartedGuide.md +++ b/sycl/doc/GetStartedGuide.md @@ -219,13 +219,12 @@ Firstly, **do not** add the toolkit to your standard environment variables (`PATH`, `LD_LIBRARY_PATH`), as to do so will create conflicts with OpenCL headers. -Secondly, set the `CUDA_LIB_PATH` environment variable and pass the CMake -variable `CUDA_TOOLKIT_ROOT_DIR` as follows: +Secondly pass the CMake variable `CUDAToolkit_ROOT` as follows: ```sh -CUDA_LIB_PATH=/path/to/cuda/toolkit/lib64/stubs CC=gcc CXX=g++ python $DPCPP_HOME/llvm/buildbot/configure.py --cuda --cmake-opt="-DCUDA_TOOLKIT_ROOT_DIR=/path/to/cuda/toolkit" +CC=gcc CXX=g++ python $DPCPP_HOME/llvm/buildbot/configure.py --cuda --cmake-opt="-DCUDAToolkit_ROOT=/path/to/cuda/toolkit" -CUDA_LIB_PATH=/path/to/cuda/toolkit/lib64/stubs CC=gcc CXX=g++ python $DPCPP_HOME/llvm/buildbot/compile.py +CC=gcc CXX=g++ python $DPCPP_HOME/llvm/buildbot/compile.py $DPCPP_HOME/llvm/build/bin/clang++ -std=c++17 -O3 -fsycl -fsycl-targets=nvptx64-nvidia-cuda --cuda-path=/path/to/cuda/toolkit *.cpp -o a.out diff --git a/sycl/tools/sycl-trace/CMakeLists.txt b/sycl/tools/sycl-trace/CMakeLists.txt index ed1987f8137c9..e232b6bdeda74 100644 --- a/sycl/tools/sycl-trace/CMakeLists.txt +++ b/sycl/tools/sycl-trace/CMakeLists.txt @@ -90,36 +90,25 @@ target_include_directories(sycl_ur_trace_collector PRIVATE if(SYCL_BUILD_BACKEND_CUDA) - find_package(CUDA 10.1 REQUIRED) + find_package(CUDAToolkit 10.1 REQUIRED) target_compile_definitions(cuda_trace_collector PRIVATE USE_UR_CUDA) - # The following two if's can be removed when FindCUDA -> FindCUDAToolkit. - # CUDA_CUPTI_INCLUDE_DIR -> CUDAToolkit_CUPTI_INCLUDE_DIR - include(FindCUDACupti) - if(NOT CUDA_CUPTI_INCLUDE_DIR) - find_cuda_cupti_include_dir() - endif() - # CUDA_cupti_LIBRARY -> CUDAToolkit_cupti_LIBRARY - if(NOT CUDA_cupti_LIBRARY) - find_cuda_cupti_library() - endif() - target_include_directories(cuda_trace_collector PRIVATE - ${CUDA_CUPTI_INCLUDE_DIR} + ${CUDAToolkit_cupti_INCLUDE_DIR} ) target_link_libraries(cuda_trace_collector PRIVATE cudadrv - ${CUDA_cupti_LIBRARY} + ${CUDAToolkit_cupti_LIBRARY} ) find_path(GEN_CUDA_META_H_DIR generated_cuda_meta.h PATHS - "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include" - "${CUDA_INCLUDE_DIRS}/../extras/CUPTI/include" - "${CUDA_INCLUDE_DIRS}" + "${CUDAToolkit_ROOT}/extras/CUPTI/include" + "${CUDAToolkit_INCLUDE_DIRS}/../extras/CUPTI/include" + "${CUDAToolkit_INCLUDE_DIRS}" NO_DEFAULT_PATH) if( EXISTS "${GEN_CUDA_META_H_DIR}/generated_cuda_meta.h" ) diff --git a/unified-runtime/cmake/FindCUDACupti.cmake b/unified-runtime/cmake/FindCUDACupti.cmake deleted file mode 100644 index 3e8447bcdd004..0000000000000 --- a/unified-runtime/cmake/FindCUDACupti.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# Part of the Unified-Runtime Project, under the Apache License v2.0 with LLVM Exceptions. -# See LICENSE.TXT -# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - -# This is lifted from intel-llvm's FindCUDACupti implementation -# https://github.com/intel/llvm/blob/0cd04144d9ca83371c212e8e4709a59c968291b9/sycl/cmake/modules/FindCUDACupti.cmake - -macro(find_cuda_cupti_library) - find_library(CUDA_cupti_LIBRARY - NAMES cupti - HINTS ${CUDA_TOOLKIT_ROOT_DIR} - ENV CUDA_PATH - PATH_SUFFIXES nvidia/current lib64 lib/x64 lib - ../extras/CUPTI/lib64/ - ../extras/CUPTI/lib/ - ) -endmacro() - -macro(find_cuda_cupti_include_dir) - find_path(CUDA_CUPTI_INCLUDE_DIR cupti.h PATHS - "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include" - "${CUDA_INCLUDE_DIRS}/../extras/CUPTI/include" - "${CUDA_INCLUDE_DIRS}" - NO_DEFAULT_PATH) -endmacro() diff --git a/unified-runtime/source/adapters/cuda/CMakeLists.txt b/unified-runtime/source/adapters/cuda/CMakeLists.txt index 7f9bc610ad2aa..e7e2976548338 100644 --- a/unified-runtime/source/adapters/cuda/CMakeLists.txt +++ b/unified-runtime/source/adapters/cuda/CMakeLists.txt @@ -54,7 +54,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES ) find_package(Threads REQUIRED) -find_package(CUDA 10.1 REQUIRED) +find_package(CUDAToolkit 10.1 REQUIRED) # Make imported library global to use it within the project. add_library(cudadrv SHARED IMPORTED GLOBAL) @@ -62,14 +62,14 @@ add_library(cudadrv SHARED IMPORTED GLOBAL) if (WIN32) set_target_properties( cudadrv PROPERTIES - IMPORTED_IMPLIB ${CUDA_CUDA_LIBRARY} - INTERFACE_INCLUDE_DIRECTORIES ${CUDA_INCLUDE_DIRS} + IMPORTED_IMPLIB ${CUDA_cuda_driver_LIBRARY} + INTERFACE_INCLUDE_DIRECTORIES ${CUDAToolkit_INCLUDE_DIRS} ) else() set_target_properties( cudadrv PROPERTIES - IMPORTED_LOCATION ${CUDA_CUDA_LIBRARY} - INTERFACE_INCLUDE_DIRECTORIES ${CUDA_INCLUDE_DIRS} + IMPORTED_LOCATION ${CUDA_cuda_driver_LIBRARY} + INTERFACE_INCLUDE_DIRECTORIES ${CUDAToolkit_INCLUDE_DIRS} ) endif() @@ -82,17 +82,6 @@ endif() # Only enable xpti tracing on Linux as tracing tools aren't available on # Windows yet. if (UR_ENABLE_TRACING AND UNIX) - include(FindCUDACupti) - # The following two ifs can be removed when FindCUDA -> FindCUDAToolkit. - # CUDA_CUPTI_INCLUDE_DIR -> CUDAToolkit_CUPTI_INCLUDE_DIR - if(NOT CUDA_CUPTI_INCLUDE_DIR) - find_cuda_cupti_include_dir() - endif() - # CUDA_cupti_LIBRARY -> CUDAToolkit_cupti_LIBRARY - if(NOT CUDA_cupti_LIBRARY) - find_cuda_cupti_library() - endif() - if (NOT XPTI_INCLUDES) get_target_property(XPTI_INCLUDES xpti INCLUDE_DIRECTORIES) endif() @@ -106,7 +95,7 @@ if (UR_ENABLE_TRACING AND UNIX) ) target_include_directories(${TARGET_NAME} PRIVATE ${XPTI_INCLUDES} - ${CUDA_CUPTI_INCLUDE_DIR} + ${CUDAToolkit_cupti_INCLUDE_DIR} ) target_sources(${TARGET_NAME} PRIVATE ${XPTI_PROXY_SRC}) endif() diff --git a/unified-runtime/source/adapters/hip/CMakeLists.txt b/unified-runtime/source/adapters/hip/CMakeLists.txt index 4ec5bfdc23212..d5c92c90ef019 100644 --- a/unified-runtime/source/adapters/hip/CMakeLists.txt +++ b/unified-runtime/source/adapters/hip/CMakeLists.txt @@ -155,17 +155,17 @@ if("${UR_HIP_PLATFORM}" STREQUAL "AMD") target_compile_definitions(${TARGET_NAME} PRIVATE __HIP_PLATFORM_AMD__) elseif("${UR_HIP_PLATFORM}" STREQUAL "NVIDIA") # Import CUDA libraries - find_package(CUDA REQUIRED) + find_package(CUDAToolkit REQUIRED) find_package(Threads REQUIRED) - list(APPEND HIP_HEADERS ${CUDA_INCLUDE_DIRS}) + list(APPEND HIP_HEADERS ${CUDAToolkit_INCLUDE_DIRS}) # cudadrv may be defined by the CUDA plugin if(NOT TARGET cudadrv) add_library(cudadrv SHARED IMPORTED GLOBAL) set_target_properties( cudadrv PROPERTIES - IMPORTED_LOCATION ${CUDA_CUDA_LIBRARY} + IMPORTED_LOCATION ${CUDA_cuda_driver_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES "${HIP_HEADERS}" INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_HEADERS}" ) @@ -174,7 +174,7 @@ elseif("${UR_HIP_PLATFORM}" STREQUAL "NVIDIA") add_library(cudart SHARED IMPORTED GLOBAL) set_target_properties( cudart PROPERTIES - IMPORTED_LOCATION ${CUDA_CUDART_LIBRARY} + IMPORTED_LOCATION ${CUDA_cudart_LIBRARY} INTERFACE_INCLUDE_DIRECTORIES "${HIP_HEADERS}" INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${HIP_HEADERS}" ) diff --git a/unified-runtime/source/common/CMakeLists.txt b/unified-runtime/source/common/CMakeLists.txt index 5443e9de79db3..c60a674ebcd65 100644 --- a/unified-runtime/source/common/CMakeLists.txt +++ b/unified-runtime/source/common/CMakeLists.txt @@ -12,9 +12,9 @@ else() endif() if (UR_BUILD_ADAPTER_CUDA) - find_package(CUDA 10.1 REQUIRED) + find_package(CUDAToolkit 10.1 REQUIRED) set(UMF_BUILD_CUDA_PROVIDER ON CACHE INTERNAL "Build UMF CUDA provider") - set(UMF_CUDA_INCLUDE_DIR "${CUDA_INCLUDE_DIRS}" CACHE INTERNAL "CUDA headers") + set(UMF_CUDA_INCLUDE_DIR "${CUDAToolkit_INCLUDE_DIRS}" CACHE INTERNAL "CUDA headers") else() set(UMF_BUILD_CUDA_PROVIDER OFF CACHE INTERNAL "Build UMF CUDA provider") endif()