change cmake module CUDA -> CUDAToolkit

Author: pgorlani

sycl/plugins/cuda/CMakeLists.txt

@@ -4,22 +4,24 @@ 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(CUDA 10.1 REQUIRED)
+find_package(CUDAToolkit 10.1 REQUIRED)
+
+message(STATUS "Including the PI API CUDA backend.")
 
 # 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_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()
 

sycl/tools/sycl-trace/CMakeLists.txt

@@ -60,7 +60,7 @@ add_dependencies(sycl_pi_trace_collector pi-pretty-printers ze-pretty-printers)
 
 if(SYCL_BUILD_PI_CUDA)
 
-  find_package(CUDA 10.1 REQUIRED)
+  find_package(CUDAToolkit 10.1 REQUIRED)
   target_include_directories(sycl_pi_trace_collector
     PRIVATE
     "${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include"
@@ -75,7 +75,8 @@ if(SYCL_BUILD_PI_CUDA)
   add_custom_target(cuda-pretty-printers
     COMMAND ${Python3_EXECUTABLE}
     ${CMAKE_CURRENT_SOURCE_DIR}/generate_cuda_pretty_printers.py
-    ${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include/generated_cuda_meta.h
+#    ${CUDA_TOOLKIT_ROOT_DIR}/extras/CUPTI/include/generated_cuda_meta.h
+/usr/local/cuda/targets/x86_64-linux/include/generated_cuda_meta.h
     DEPENDS pi_cuda
     BYPRODUCTS
       ${CMAKE_CURRENT_BINARY_DIR}/cuda_printers.def