From a0bed696328bc593165a23bf118e20486a2c7fa7 Mon Sep 17 00:00:00 2001 From: Jacob Kahn Date: Tue, 18 May 2021 02:28:38 -0500 Subject: [PATCH] [cudnn] Fix port: install find module, add usage (#17644) * [cudnn] Fix port * [cudnn] Update version * x-add-version again... --- ports/cudnn/CONTROL | 2 +- ports/cudnn/portfile.cmake | 3 +++ ports/cudnn/usage | 10 ++++++++++ versions/baseline.json | 2 +- versions/c-/cudnn.json | 5 +++++ 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 ports/cudnn/usage diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL index db910a7bcc..724918356c 100644 --- a/ports/cudnn/CONTROL +++ b/ports/cudnn/CONTROL @@ -1,6 +1,6 @@ Source: cudnn Version: 7.6.5 -Port-Version: 2 +Port-Version: 3 Description: NVIDIA's cuDNN deep neural network acceleration library Build-Depends: cuda Supports: (windows|linux)&x64 diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 6a00831308..7ec09f030d 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -70,3 +70,6 @@ elseif(VCPKG_TARGET_IS_WINDOWS) else() message(FATAL_ERROR "Please install CUDNN using your system package manager (the same way you installed CUDA). For example: apt install libcudnn8-dev.") 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}) diff --git a/ports/cudnn/usage b/ports/cudnn/usage new file mode 100644 index 0000000000..f528e01546 --- /dev/null +++ b/ports/cudnn/usage @@ -0,0 +1,10 @@ +The package cudnn provides CMake variables: + + find_package(CUDNN REQUIRED) + target_link_libraries(main PRIVATE ${CUDNN_LIBRARIES}) + target_include_directories(main PRIVATE ${CUDNN_INCLUDE_DIRS}) + +Or the following CMake target: + + find_package(CUDNN REQUIRED) + target_link_libraries(main PRIVATE CuDNN::CuDNN) diff --git a/versions/baseline.json b/versions/baseline.json index 7508a29868..d419f8575a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1530,7 +1530,7 @@ }, "cudnn": { "baseline": "7.6.5", - "port-version": 2 + "port-version": 3 }, "cunit": { "baseline": "2.1.3-6", diff --git a/versions/c-/cudnn.json b/versions/c-/cudnn.json index cc7e05d0ce..5dfd33643a 100644 --- a/versions/c-/cudnn.json +++ b/versions/c-/cudnn.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "00e54079329e9cc4f1f623dce3bc39b0f19e958d", + "version-string": "7.6.5", + "port-version": 3 + }, { "git-tree": "5581791a9ad35390ed30629985b3863cf8b85bba", "version-string": "7.6.5",