Switches to using FindCUDAToolkit (#3154)

* Switches to using FindCUDAToolkit

* Increases minimum CMake version to 3.17 for FindCUDAToolkit
Co-authored-by: David Clark <daclark@nvidia.com>

CMakeLists.txt

@@ -21,7 +21,7 @@ IF( NOT PROJECT_NAME )
     PROJECT (OpenMM)
 ENDIF( NOT PROJECT_NAME )
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.17)
 CMAKE_POLICY(SET CMP0042 OLD)
 CMAKE_POLICY(SET CMP0003 NEW)
 CMAKE_POLICY(SET CMP0005 NEW)
@@ -326,12 +326,12 @@ ENDIF(BUILD_TESTING AND OPENMM_BUILD_REFERENCE_TESTS)
 
 # CUDA platform
 
-FIND_PACKAGE(CUDA QUIET)
-IF(CUDA_FOUND)
+FIND_PACKAGE(CUDAToolkit QUIET)
+IF(CUDAToolkit_FOUND)
     SET(OPENMM_BUILD_CUDA_LIB ON CACHE BOOL "Build OpenMMCuda library for Nvidia GPUs")
-ELSE(CUDA_FOUND)
+ELSE(CUDAToolkit_FOUND)
     SET(OPENMM_BUILD_CUDA_LIB OFF CACHE BOOL "Build OpenMMCuda library for Nvidia GPUs")
-ENDIF(CUDA_FOUND)
+ENDIF(CUDAToolkit_FOUND)
 IF(OPENMM_BUILD_CUDA_LIB)
     ADD_SUBDIRECTORY(platforms/cuda)
 ENDIF(OPENMM_BUILD_CUDA_LIB)
@@ -350,7 +350,7 @@ ENDIF(OPENMM_BUILD_OPENCL_LIB)
 
 # Common compute files
 
-IF(CUDA_FOUND OR OPENCL_FOUND)
+IF(CUDAToolkit_FOUND OR OPENCL_FOUND)
     ADD_SUBDIRECTORY(platforms/common)
 ENDIF()
 

platforms/cuda/sharedTarget/CMakeLists.txt

 #
 # Include CUDA related files.
 #
-INCLUDE(FindCUDA)
-INCLUDE_DIRECTORIES(${CUDA_TOOLKIT_INCLUDE})
+INCLUDE_DIRECTORIES(${CUDAToolkit_LIBRARY_DIR})
 
 FILE(GLOB CUDA_KERNELS ${KERNEL_SOURCE_DIR}/kernels/*.cu)
 ADD_CUSTOM_COMMAND(OUTPUT ${KERNELS_CPP} ${KERNELS_H}
@@ -14,7 +13,7 @@ SET_SOURCE_FILES_PROPERTIES(${KERNELS_CPP} ${KERNELS_H} ${COMMON_KERNELS_CPP} PR
 ADD_LIBRARY(${SHARED_TARGET} SHARED ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
 ADD_DEPENDENCIES(${SHARED_TARGET} CommonKernels)
 
-TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${OPENMM_LIBRARY_NAME} ${CUDA_CUDA_LIBRARY} ${CUDA_cufft_LIBRARY} ${PTHREADS_LIB})
+TARGET_LINK_LIBRARIES(${SHARED_TARGET} ${OPENMM_LIBRARY_NAME} CUDA::cuda_driver CUDA::cufft ${PTHREADS_LIB})
 SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DOPENMM_COMMON_BUILDING_SHARED_LIBRARY")
 IF (APPLE)
     SET_TARGET_PROPERTIES(${SHARED_TARGET} PROPERTIES LINK_FLAGS "${EXTRA_COMPILE_FLAGS} -F/Library/Frameworks -framework CUDA")

platforms/cuda/staticTarget/CMakeLists.txt

 #
 # Include CUDA related files.
 #
-INCLUDE(FindCUDA)
-INCLUDE_DIRECTORIES(${CUDA_TOOLKIT_INCLUDE})
+INCLUDE_DIRECTORIES(${CUDAToolkit_LIBRARY_DIR})
 
 FILE(GLOB CUDA_KERNELS ${KERNEL_SOURCE_DIR}/kernels/*.cu)
 ADD_CUSTOM_COMMAND(OUTPUT ${KERNELS_CPP} ${KERNELS_H}
@@ -13,7 +12,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${KERNELS_CPP} ${KERNELS_H}
 SET_SOURCE_FILES_PROPERTIES(${KERNELS_CPP} ${KERNELS_H} PROPERTIES GENERATED TRUE)
 ADD_LIBRARY(${STATIC_TARGET} STATIC ${SOURCE_FILES} ${SOURCE_INCLUDE_FILES} ${API_ABS_INCLUDE_FILES})
 
-TARGET_LINK_LIBRARIES(${STATIC_TARGET} ${OPENMM_LIBRARY_NAME} ${CUDA_CUDA_LIBRARY} ${CUDA_cufft_LIBRARY} ${PTHREADS_LIB_STATIC})
+TARGET_LINK_LIBRARIES(${STATIC_TARGET} ${OPENMM_LIBRARY_NAME} CUDA::cuda_driver CUDA::cufft_static ${PTHREADS_LIB_STATIC})
 SET_TARGET_PROPERTIES(${STATIC_TARGET} PROPERTIES COMPILE_FLAGS "${EXTRA_COMPILE_FLAGS} -DOPENMM_COMMON_BUILDING_STATIC_LIBRARY")
 IF (APPLE)
     SET_TARGET_PROPERTIES(${STATIC_TARGET} PROPERTIES LINK_FLAGS "${EXTRA_COMPILE_FLAGS} -F/Library/Frameworks -framework CUDA")

platforms/cuda/tests/CMakeLists.txt

@@ -4,8 +4,7 @@
 
 ENABLE_TESTING()
 
-INCLUDE(FindCUDA)
-INCLUDE_DIRECTORIES(${CUDA_TOOLKIT_INCLUDE})
+INCLUDE_DIRECTORIES(${CUDAToolkit_LIBRARY_DIR})
 
 SET(OPENMM_BUILD_CUDA_DOUBLE_PRECISION_TESTS TRUE CACHE BOOL "Whether to build double precision versions of CUDA test cases")