diff options
| author | Boris Fomitchev <bfomitchev@nvidia.com> | 2017-01-31 05:54:49 +0300 |
|---|---|---|
| committer | Boris Fomitchev <bfomitchev@nvidia.com> | 2017-01-31 05:54:49 +0300 |
| commit | 26f65f007fffe7d82f959d96551f67ac2c04133e (patch) | |
| tree | d18e6795df7a855b8bd166b198537f8163c94a68 | |
| parent | da7e793e1aa8a92536e272b795e9314f00ee0d4c (diff) | |
Added rc suffix handling, for 6.0
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/FindCUDNN.cmake | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b9b308..e5453dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,7 @@ IF(NOT COMMAND CUDNN_INSTALL) INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindCUDNN.cmake) ENDIF() -FIND_PACKAGE(CUDNN 5.0 EXACT) - -MESSAGE(STATUS "Found Cudnn_${CUDNN_VERSION} (${CUDNN_MAJOR_VERSION}.${CUDNN_MINOR_VERSION}) at ${CUDNN_INCLUDE} ${CUDNN_LIBRARY}") +FIND_PACKAGE(CUDNN 5.1 EXACT) IF(NOT CUDNN_FOUND) CUDNN_INSTALL(5.1 ${CMAKE_INSTALL_PREFIX}) diff --git a/cmake/FindCUDNN.cmake b/cmake/FindCUDNN.cmake index de1324f..1aeb627 100644 --- a/cmake/FindCUDNN.cmake +++ b/cmake/FindCUDNN.cmake @@ -34,6 +34,7 @@ # function(CUDNN_INSTALL version dest_dir) + string(REGEX REPLACE "-rc$" "" version_base "${version}") if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") @@ -58,7 +59,7 @@ function(CUDNN_INSTALL version dest_dir) file(MAKE_DIRECTORY ${__download_dir}) set(__cudnn_filename cudnn-${CUDA_VERSION}-${__url_arch_name}-v${version}.tgz) set(__base_url http://developer.download.nvidia.com/compute/redist/cudnn) - set(__cudnn_url ${__base_url}/v${version}/${__cudnn_filename}) + set(__cudnn_url ${__base_url}/v${version_base}/${__cudnn_filename}) set(__cudnn_tgz ${__download_dir}/${__cudnn_filename}) if(NOT EXISTS ${__cudnn_tgz}) @@ -69,7 +70,8 @@ function(CUDNN_INSTALL version dest_dir) if("${CUDNN_STATUS}" MATCHES "0") execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf "${__cudnn_tgz}" WORKING_DIRECTORY "${__download_dir}") else() - message("Was not able to download CUDNN. Please install CuDNN manually from https://developer.nvidia.com/cuDNN") + message("Was not able to download CUDNN from ${__cudnn_url}. Please install CuDNN manually from https://developer.nvidia.com/cuDNN") + file(REMOVE ${__cudnn_tgz}) endif() endif() @@ -142,7 +144,6 @@ else() endif() endif() math(EXPR CUDNN_VERSION_NUM "${CUDNN_MAJOR_VERSION} * 1000 + ${CUDNN_MINOR_VERSION} * 100 + ${CUDNN_PATCH_VERSION}") - message(STATUS "Found Cudnn_${CUDNN_VERSION_NUM} at ${CUDNN_INCLUDE} ${CUDNN_LIBRARY}") endif() |