diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-05-25 06:41:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 15:41:57 -0700 |
| commit | fd5bc0cea64b5cf0965768e51d679cd1c6342ed0 (patch) | |
| tree | 7f8fc143c793e4f9602a69ef58d59cfea60b7aa3 | |
| parent | 6608a9cc606a76300bbff6776788a157593f15c1 (diff) | |
| download | vcpkg-fd5bc0cea64b5cf0965768e51d679cd1c6342ed0.tar.gz vcpkg-fd5bc0cea64b5cf0965768e51d679cd1c6342ed0.zip | |
[cudnn] Add library path (#18005)
* [cudnn] Add library path
* Update version files
* Install vcpkg-cmake-wrapper.cmake and fix typo error in FindCUDNN.cmake
* Update versions/c-/cudnn.json
| -rw-r--r-- | ports/cudnn/CONTROL | 6 | ||||
| -rw-r--r-- | ports/cudnn/FindCUDNN.cmake | 4 | ||||
| -rw-r--r-- | ports/cudnn/portfile.cmake | 3 | ||||
| -rw-r--r-- | ports/cudnn/vcpkg.json | 11 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/c-/cudnn.json | 5 |
6 files changed, 21 insertions, 10 deletions
diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL deleted file mode 100644 index 724918356..000000000 --- a/ports/cudnn/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: cudnn -Version: 7.6.5 -Port-Version: 3 -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 ebf50cfe3..4e013bca7 100644 --- a/ports/cudnn/FindCUDNN.cmake +++ b/ports/cudnn/FindCUDNN.cmake @@ -29,14 +29,14 @@ find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h PATH_SUFFIXES cuda/include include) find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 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) + PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64) 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") file(READ ${CUDNN_INCLUDE_DIR}/cudnn_v8.h CUDNN_HEADER_CONTENTS) elseif(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_v7.h") file(READ ${CUDNN_INCLUDE_DIR}/cudnn_v7.h CUDNN_HEADER_CONTENTS) -endif +endif() if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn_version.h") file(READ "${CUDNN_INCLUDE_DIR}/cudnn_version.h" CUDNN_VERSION_H_CONTENTS) string(APPEND CUDNN_HEADER_CONTENTS "${CUDNN_VERSION_H_CONTENTS}") diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 7ec09f030..5fd95634c 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -20,7 +20,7 @@ find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}") find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7 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) + PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/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) @@ -73,3 +73,4 @@ endif() file(INSTALL "${CURRENT_PORT_DIR}/FindCUDNN.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CURRENT_PORT_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
\ No newline at end of file diff --git a/ports/cudnn/vcpkg.json b/ports/cudnn/vcpkg.json new file mode 100644 index 000000000..7c52ccc7a --- /dev/null +++ b/ports/cudnn/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "cudnn", + "version": "7.6.5", + "port-version": 4, + "description": "NVIDIA's cuDNN deep neural network acceleration library.", + "homepage": "https://developer.nvidia.com/cudnn", + "supports": "(windows | linux) & x64", + "dependencies": [ + "cuda" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 5bfa3de68..98347c2e6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1538,7 +1538,7 @@ }, "cudnn": { "baseline": "7.6.5", - "port-version": 3 + "port-version": 4 }, "cunit": { "baseline": "2.1.3-6", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index 5dfd33643..6e6a6fd92 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c23360a6cfba2b5c8962c0c106d165ca31224162", + "version": "7.6.5", + "port-version": 4 + }, + { "git-tree": "00e54079329e9cc4f1f623dce3bc39b0f19e958d", "version-string": "7.6.5", "port-version": 3 |