check cupti as FindCUDAToolkit

Author: pgorlani

sycl/plugins/cuda/CMakeLists.txt

@@ -4,31 +4,40 @@ message(STATUS "Including the PI API CUDA backend.")
  # we only require the CUDA driver API to be used
  # CUDA_CUDA_LIBRARY variable defines the path to libcuda.so, the CUDA Driver API library.
 
-find_package(CUDAToolkit 10.1 REQUIRED)
-
-message(STATUS "Including the PI API CUDA backend.")
+find_package(CUDA 10.1 REQUIRED)
 
 # Make imported library global to use it within the project.
 add_library(cudadrv SHARED IMPORTED GLOBAL)
 
 if (WIN32)
   set_target_properties(
     cudadrv PROPERTIES 
-      IMPORTED_IMPLIB               ${CUDA_cuda_driver_LIBRARY}
-      INTERFACE_INCLUDE_DIRECTORIES ${CUDAToolkit_INCLUDE_DIRS}
+      IMPORTED_IMPLIB               ${CUDA_CUDA_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${CUDA_INCLUDE_DIRS}
   )
 else()
   set_target_properties(
     cudadrv PROPERTIES 
-      IMPORTED_LOCATION             ${CUDA_cuda_driver_LIBRARY}
-      INTERFACE_INCLUDE_DIRECTORIES ${CUDAToolkit_INCLUDE_DIRS}
+      IMPORTED_LOCATION             ${CUDA_CUDA_LIBRARY}
+      INTERFACE_INCLUDE_DIRECTORIES ${CUDA_INCLUDE_DIRS}
   )
 endif()
 
 if (SYCL_ENABLE_XPTI_TRACING)
   set(XPTI_PROXY_SRC "${CMAKE_SOURCE_DIR}/../xpti/src/xpti_proxy.cpp")
 endif()
 
+if(NOT 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/
+  )
+endif()
+
 add_sycl_plugin(cuda
   SOURCES
     "${sycl_inc_dir}/sycl/detail/pi.h"
@@ -51,10 +60,18 @@ if (SYCL_ENABLE_XPTI_TRACING)
   target_link_libraries(pi_cuda PRIVATE ${CMAKE_DL_LIBS})
 endif()
 
+# The following find_path can be removed when FindCUDA -> FindCUDAToolkit, and
+# _CUPTI_INCLUDE_DIR -> CUDAToolkit_CUPTI_INCLUDE_DIR
+find_path(_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)
+
 target_include_directories(pi_cuda
   PRIVATE
     ${sycl_inc_dir}
-    "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include"
+    ${_CUPTI_INCLUDE_DIR}
 )
 
 set_target_properties(pi_cuda PROPERTIES LINKER_LANGUAGE CXX)

sycl/tools/sycl-trace/CMakeLists.txt

@@ -60,28 +60,48 @@ add_dependencies(sycl_pi_trace_collector pi-pretty-printers ze-pretty-printers)
 
 if(SYCL_BUILD_PI_CUDA)
 
+  find_package(CUDA 10.1 REQUIRED)
   target_compile_definitions(sycl_pi_trace_collector
     PRIVATE
       $<$<BOOL:${SYCL_BUILD_PI_CUDA}>:USE_PI_CUDA>
   )
 
-  find_package(CUDAToolkit 10.1 REQUIRED)
+  # The following find_path can be removed when FindCUDA -> FindCUDAToolkit, and
+  # _CUPTI_INCLUDE_DIR -> CUDAToolkit_CUPTI_INCLUDE_DIR
+  find_path(_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)
+
   target_include_directories(sycl_pi_trace_collector
     PRIVATE
-    "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include"
+    ${_CUPTI_INCLUDE_DIR}
   )
 
+  # The following if can be removed when FindCUDA -> FindCUDAToolkit
+  if(NOT 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/
+    )
+  endif()
+
   target_link_libraries(sycl_pi_trace_collector
     PRIVATE
       cudadrv
       ${CUDA_cupti_LIBRARY}
   )
 
-  find_path (GEN_CUDA_META_H_DIR generated_cuda_meta.h
-    PATH
-      ${CUDAToolkit_INCLUDE_DIRS}
+  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}"
+      NO_DEFAULT_PATH)
 
   if( EXISTS "${GEN_CUDA_META_H_DIR}/generated_cuda_meta.h" )
   add_custom_target(cuda-pretty-printers