From 13ccbca1d4797e7e2cf7ea79ce15fc9f70a4cf44 Mon Sep 17 00:00:00 2001 From: jacobkahn Date: Mon, 23 Nov 2020 18:44:22 -0800 Subject: [PATCH 1/3] [cudnn] Don't copy debug versions of the lib since they aren't provided --- ports/cudnn/portfile.cmake | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 5902861c5e9eb5..3ea47fd6e06505 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -87,16 +87,11 @@ else() file(INSTALL "${SOURCE_PATH}/Library/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL "${SOURCE_PATH}/Library/lib/x64/cudnn.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/Library/bin/cudnn64_${CUDNN_VERSION_MAJOR}.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) elseif(VCPKG_TARGET_IS_LINUX) file(INSTALL "${SOURCE_PATH}/include/cudnn.h" DESTINATION ${CURRENT_PACKAGES_DIR}/include) file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so.${CUDNN_VERSION_MAJOR}" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) - file(INSTALL "${SOURCE_PATH}/lib/libcudnn.so" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) endif() file(INSTALL "${SOURCE_PATH}/info/LICENSE.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 7923e428372b4a2f8348a6158e00c6d2ac4e7b7f Mon Sep 17 00:00:00 2001 From: jacobkahn Date: Mon, 23 Nov 2020 21:42:13 -0800 Subject: [PATCH 2/3] Bump port version --- ports/cudnn/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/cudnn/CONTROL b/ports/cudnn/CONTROL index 386b3fea7a48ae..3166890d3d22a7 100644 --- a/ports/cudnn/CONTROL +++ b/ports/cudnn/CONTROL @@ -1,6 +1,6 @@ Source: cudnn Version: 7.6 -Port-Version: 3 +Port-Version: 4 Description: NVIDIA's cuDNN deep neural network acceleration library Build-Depends: cuda Supports: (windows|linux)&x64 From fe48c148f7f732465d8c8826e7f7fb6c43eb99e3 Mon Sep 17 00:00:00 2001 From: jacobkahn Date: Mon, 30 Nov 2020 10:01:18 -0800 Subject: [PATCH 3/3] add VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES --- ports/cudnn/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/cudnn/portfile.cmake b/ports/cudnn/portfile.cmake index 3ea47fd6e06505..768ef39aa8b24b 100644 --- a/ports/cudnn/portfile.cmake +++ b/ports/cudnn/portfile.cmake @@ -7,6 +7,7 @@ if(NOT VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") endif() vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT) +set(VCPKG_POLICY_MISMATCHED_NUMBER_OF_BINARIES enabled) # only release bits are provided #note: this port must be kept in sync with CUDA port: every time one is upgraded, the other must be too set(CUDNN_VERSION "7.6.0")