diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2021-04-19 20:22:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 11:22:14 -0700 |
| commit | 1826fb87756e5cc3010e2a76041c0dfe3533c9bd (patch) | |
| tree | 6ffb8e8e66ca818d29d644dfe2b1d4744651ff23 | |
| parent | 414bec05f2a97cfc0ddb8e22fd4635dfe2a20ab8 (diff) | |
| download | vcpkg-1826fb87756e5cc3010e2a76041c0dfe3533c9bd.tar.gz vcpkg-1826fb87756e5cc3010e2a76041c0dfe3533c9bd.zip | |
[cudnn] add other locations to find lib already installed (#17346)
* [cudnn] add other install dir on linux
* [cudnn] add other locations for linux
* [cudnn] fix env variables
* [cudnn] fix references
* [cudnn] use also cuda module as a hint
* [cudnn] fix refs
| -rw-r--r-- | ports/cudnn/CONTROL | 1 | ||||
| -rw-r--r-- | ports/cudnn/FindCUDNN.cmake | 4 | ||||
| -rw-r--r-- | ports/cudnn/portfile.cmake | 12 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/cudnn.json | 5 |
5 files changed, 16 insertions, 8 deletions
diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL index 864748b44..ebb814349 100644 --- a/ports/cudnn/CONTROL +++ b/ports/cudnn/CONTROL @@ -1,5 +1,6 @@ Source: cudnn Version: 7.6.5 +Port-Version: 1 Description: NVIDIA's cuDNN deep neural network acceleration library Build-Depends: cuda Supports: (windows|linux)&x64 diff --git a/ports/cudnn/FindCUDNN.cmake b/ports/cudnn/FindCUDNN.cmake index b1d05d49e..ebf50cfe3 100644 --- a/ports/cudnn/FindCUDNN.cmake +++ b/ports/cudnn/FindCUDNN.cmake @@ -25,10 +25,10 @@ include(FindPackageHandleStandardArgs) find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h - HINTS ${CUDA_HOME} ${CUDA_PATH} ${CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} + HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include PATH_SUFFIXES cuda/include include) find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 - HINTS ${CUDA_HOME} ${CUDA_PATH} ${CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} + HINTS $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64) if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index e8497541f..1c1f0641e 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -11,13 +11,18 @@ set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # only release bits are set(MINIMUM_CUDNN_VERSION "7.6.5") +include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) +vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION) + # Try to find CUDNN if it exists; only download if it doesn't exist find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h - HINTS ${CUDA_HOME} ${CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/include PATH_SUFFIXES cuda/include include) +message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}") find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 - HINTS ${CUDA_HOME} ${CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} + HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} /usr/lib/x86_64-linux-gnu/ PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64) +message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}") if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h") file(READ ${CUDNN_INCLUDE_DIR}/cudnn.h CUDNN_HEADER_CONTENTS) elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_v8.h") @@ -64,9 +69,6 @@ else() set(CUDNN_FOUND FALSE) endif() -include(${CURRENT_INSTALLED_DIR}/share/cuda/vcpkg_find_cuda.cmake) -vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION) - # Download CUDNN if not found if (CUDNN_FOUND) message(STATUS "Found CUDNN ${_CUDNN_VERSION} located on system: (include ${CUDNN_INCLUDE_DIR} lib: ${CUDNN_LIBRARY})") diff --git a/versions/baseline.json b/versions/baseline.json index e3441409c..7812ac680 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1526,7 +1526,7 @@ }, "cudnn": { "baseline": "7.6.5", - "port-version": 0 + "port-version": 1 }, "cunit": { "baseline": "2.1.3-6", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index ddb1b9967..4930853d4 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "495cc586b4bfdb28c3c339d3f471b9fbfc8bc481", + "version-string": "7.6.5", + "port-version": 1 + }, + { "git-tree": "681f177cf063d3c8e655a18011c158ffad49fdbd", "version-string": "7.6.5", "port-version": 0 |