Merge pull request #15 from CentML/dec18-cmake-path

jimgao1 · web-flow · commit 421248ce3626 · 2022-12-19T16:40:00.000-05:00
Add alternative CUPTI/NVPerf paths
diff --git a/cpp/cmake/FindCUPTI.cmake b/cpp/cmake/FindCUPTI.cmake
@@ -47,6 +47,7 @@ find_path(CUPTI_INCLUDE_DIR cupti.h
   ${CUPTI_DIR}/include
   ${CUPTI_CUDA_HOME}/extras/CUPTI/include
   ${CUPTI_CUDA_HOME}/include
+  /usr/local/cuda/include
   /usr/local/cuda/extras/CUPTI/include
 )
 
@@ -55,6 +56,7 @@ find_library(CUPTI_LIBRARY cupti
   ${CUPTI_DIR}/lib/x64
   ${CUPTI_CUDA_HOME}/extras/CUPTI/lib64
   ${CUPTI_CUDA_HOME}/lib64
+  /usr/local/cuda/lib64
   /usr/local/cuda/extras/CUPTI/lib64
 )
 
diff --git a/cpp/cmake/FindNVPerf.cmake b/cpp/cmake/FindNVPerf.cmake
@@ -45,6 +45,7 @@ find_library(NVPerf_HOST_LIBRARY nvperf_host
   ${CUPTI_DIR}/lib/x64
   ${CUPTI_CUDA_HOME}/extras/CUPTI/lib64
   ${CUPTI_CUDA_HOME}/lib64
+  /usr/local/cuda/lib64
   /usr/local/cuda/extras/CUPTI/lib64
 )
 
@@ -53,6 +54,7 @@ find_library(NVPerf_TARGET_LIBRARY nvperf_target
   ${CUPTI_DIR}/lib/x64
   ${CUPTI_CUDA_HOME}/extras/CUPTI/lib64
   ${CUPTI_CUDA_HOME}/lib64
+  /usr/local/cuda/lib64
   /usr/local/cuda/extras/CUPTI/lib64
 )
 

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