Merge pull request #6 from CentML/cmake-alternative-paths-cupti

jimgao1 · web-flow · commit e9d3f6e72071 · 2022-08-29T15:20:27.000-04:00
Add alternative paths of CUPTI and NVPerf for CMake
diff --git a/cpp/cmake/FindCUPTI.cmake b/cpp/cmake/FindCUPTI.cmake
@@ -46,13 +46,15 @@ find_path(CUPTI_INCLUDE_DIR cupti.h
   HINTS
   ${CUPTI_DIR}/include
   ${CUPTI_CUDA_HOME}/extras/CUPTI/include
+  ${CUPTI_CUDA_HOME}/include
   /usr/local/cuda/extras/CUPTI/include
 )
 
 find_library(CUPTI_LIBRARY cupti
   HINTS
   ${CUPTI_DIR}/lib/x64
   ${CUPTI_CUDA_HOME}/extras/CUPTI/lib64
+  ${CUPTI_CUDA_HOME}/lib64
   /usr/local/cuda/extras/CUPTI/lib64
 )
 
diff --git a/cpp/cmake/FindNVPerf.cmake b/cpp/cmake/FindNVPerf.cmake
@@ -44,13 +44,15 @@ find_library(NVPerf_HOST_LIBRARY nvperf_host
   HINTS
   ${CUPTI_DIR}/lib/x64
   ${CUPTI_CUDA_HOME}/extras/CUPTI/lib64
+  ${CUPTI_CUDA_HOME}/lib64
   /usr/local/cuda/extras/CUPTI/lib64
 )
 
 find_library(NVPerf_TARGET_LIBRARY nvperf_target
   HINTS
   ${CUPTI_DIR}/lib/x64
   ${CUPTI_CUDA_HOME}/extras/CUPTI/lib64
+  ${CUPTI_CUDA_HOME}/lib64
   /usr/local/cuda/extras/CUPTI/lib64
 )
 

Original file line number	Diff line number	Diff line change
`@@ -46,13 +46,15 @@ find_path(CUPTI_INCLUDE_DIR cupti.h`
`46`	`46`	`HINTS`
`47`	`47`	`${CUPTI_DIR}/include`
`48`	`48`	`${CUPTI_CUDA_HOME}/extras/CUPTI/include`
	`49`	`+ ${CUPTI_CUDA_HOME}/include`
`49`	`50`	`/usr/local/cuda/extras/CUPTI/include`
`50`	`51`	`)`
`51`	`52`
`52`	`53`	`find_library(CUPTI_LIBRARY cupti`
`53`	`54`	`HINTS`
`54`	`55`	`${CUPTI_DIR}/lib/x64`
`55`	`56`	`${CUPTI_CUDA_HOME}/extras/CUPTI/lib64`
	`57`	`+ ${CUPTI_CUDA_HOME}/lib64`
`56`	`58`	`/usr/local/cuda/extras/CUPTI/lib64`
`57`	`59`	`)`
`58`	`60`
Original file line number	Diff line number	Diff line change
`@@ -44,13 +44,15 @@ find_library(NVPerf_HOST_LIBRARY nvperf_host`
`44`	`44`	`HINTS`
`45`	`45`	`${CUPTI_DIR}/lib/x64`
`46`	`46`	`${CUPTI_CUDA_HOME}/extras/CUPTI/lib64`
	`47`	`+ ${CUPTI_CUDA_HOME}/lib64`
`47`	`48`	`/usr/local/cuda/extras/CUPTI/lib64`
`48`	`49`	`)`
`49`	`50`
`50`	`51`	`find_library(NVPerf_TARGET_LIBRARY nvperf_target`
`51`	`52`	`HINTS`
`52`	`53`	`${CUPTI_DIR}/lib/x64`
`53`	`54`	`${CUPTI_CUDA_HOME}/extras/CUPTI/lib64`
	`55`	`+ ${CUPTI_CUDA_HOME}/lib64`
`54`	`56`	`/usr/local/cuda/extras/CUPTI/lib64`
`55`	`57`	`)`
`56`	`58`