@@ -54,21 +54,24 @@ endif()
5454option (LIBKINETO_NOCUPTI "Disable CUPTI" OFF )
5555
5656find_package (CUDAToolkit)
57- if (NOT LIBKINETO_NOCUPTI)
58- if (NOT CUPTI_INCLUDE_DIR)
59- find_path (CUPTI_INCLUDE_DIR cupti.h PATHS
60- "${CUDAToolkit_LIBRARY_ROOT} /extras/CUPTI/include"
57+ if (CUDAToolkit_LIBRARY_ROOT)
58+ set (CUDA_PATHS
6159 "${CUDAToolkit_LIBRARY_ROOT} "
60+ "${CUDAToolkit_LIBRARY_ROOT} /extras/CUPTI/include"
61+ "${CUDAToolkit_LIBRARY_ROOT} /extras/CUPTI/lib64"
6262 "${CUDAToolkit_LIBRARY_ROOT} /include"
63+ "${CUDAToolkit_LIBRARY_ROOT} /lib"
64+ "${CUDAToolkit_LIBRARY_ROOT} /lib64"
65+ )
66+ endif ()
67+ if (NOT LIBKINETO_NOCUPTI)
68+ if (NOT CUPTI_INCLUDE_DIR)
69+ find_path (CUPTI_INCLUDE_DIR cupti.h PATHS ${CUDA_PATHS}
6370 NO_DEFAULT_PATH)
6471 endif ()
6572
6673 if (NOT CUDA_cupti_LIBRARY)
67- find_library (CUDA_cupti_LIBRARY cupti PATHS
68- "${CUDAToolkit_LIBRARY_ROOT} "
69- "${CUDAToolkit_LIBRARY_ROOT} /extras/CUPTI/lib64"
70- "${CUDAToolkit_LIBRARY_ROOT} /lib"
71- "${CUDAToolkit_LIBRARY_ROOT} /lib64"
74+ find_library (CUDA_cupti_LIBRARY cupti PATHS ${CUDA_PATHS}
7275 NO_DEFAULT_PATH)
7376 endif ()
7477
@@ -87,11 +90,7 @@ if(NOT LIBKINETO_NOCUPTI)
8790 endif ()
8891endif ()
8992if (NOT TARGET CUDA::nvperf_host)
90- find_library (CUDA_NVPERF_HOST_LIB_PATH nvperf_host PATHS
91- "${CUDAToolkit_LIBRARY_ROOT} /lib/x64"
92- "${CUDAToolkit_LIBRARY_ROOT} /extras/CUPTI/lib64"
93- "${CUDAToolkit_LIBRARY_ROOT} /lib"
94- "${CUDAToolkit_LIBRARY_ROOT} /lib64"
93+ find_library (CUDA_NVPERF_HOST_LIB_PATH nvperf_host PATHS ${CUDA_PATHS}
9594 NO_DEFAULT_PATH)
9695 if (CUDA_NVPERF_HOST_LIB_PATH)
9796 message (STATUS "Found NVPERF: ${CUDA_NVPERF_HOST_LIB_PATH} " )
0 commit comments