зеркало из https://github.com/microsoft/vcpkg.git
[cudnn] Add version v9.4 (#40892)
This commit is contained in:
Родитель
f2b1b1df27
Коммит
2dd6b72cef
|
@ -23,11 +23,15 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
include(FindPackageHandleStandardArgs)
|
include(FindPackageHandleStandardArgs)
|
||||||
|
file(GLOB CUDNN_VERSION_DIRS
|
||||||
|
LIST_DIRECTORIES true
|
||||||
|
"$ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v[1-9]*.[1-9]*"
|
||||||
|
)
|
||||||
find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
|
find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
|
||||||
HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.0 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.1 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.2 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.3 /usr/include /usr/include/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/
|
HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} ${CUDNN_VERSION_DIRS} /usr/include /usr/include/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/
|
||||||
PATH_SUFFIXES cuda/include include include/11.8 include/12.0 include/12.1 include/12.2 include/12.3 include/12.4 include/12.5 include/12.6)
|
PATH_SUFFIXES cuda/include include include/11.8 include/12.0 include/12.1 include/12.2 include/12.3 include/12.4 include/12.5 include/12.6)
|
||||||
find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7
|
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} $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.0 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.1 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.2 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.3 /usr/lib/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/ /usr/
|
HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} ${CUDNN_VERSION_DIRS} /usr/lib/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/ /usr/
|
||||||
PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64 lib/11.8/x64 lib/12.0/x64 lib/12.1/x64 lib/12.2/x64 lib/12.3/x64 lib/12.4/x64 lib/12.5/x64 lib/12.6/x64)
|
PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64 lib/11.8/x64 lib/12.0/x64 lib/12.1/x64 lib/12.2/x64 lib/12.3/x64 lib/12.4/x64 lib/12.5/x64 lib/12.6/x64)
|
||||||
|
|
||||||
if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
|
if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
|
||||||
|
|
|
@ -3,12 +3,16 @@ set(MINIMUM_CUDNN_VERSION "7.6.5")
|
||||||
vcpkg_find_cuda(OUT_CUDA_TOOLKIT_ROOT CUDA_TOOLKIT_ROOT OUT_CUDA_VERSION CUDA_VERSION)
|
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
|
# Try to find CUDNN if it exists; only download if it doesn't exist
|
||||||
|
file(GLOB CUDNN_VERSION_DIRS
|
||||||
|
LIST_DIRECTORIES true
|
||||||
|
"$ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v[1-9]*.[1-9]*"
|
||||||
|
)
|
||||||
find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
|
find_path(CUDNN_INCLUDE_DIR NAMES cudnn.h cudnn_v8.h cudnn_v7.h
|
||||||
HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.0 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.1 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.2 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.3 /usr/include /usr/include/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/
|
HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} ${CUDNN_VERSION_DIRS} /usr/include /usr/include/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/
|
||||||
PATH_SUFFIXES cuda/include include include/11.8 include/12.0 include/12.1 include/12.2 include/12.3 include/12.4 include/12.5 include/12.6)
|
PATH_SUFFIXES cuda/include include include/11.8 include/12.0 include/12.1 include/12.2 include/12.3 include/12.4 include/12.5 include/12.6)
|
||||||
message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}")
|
message(STATUS "CUDNN_INCLUDE_DIR: ${CUDNN_INCLUDE_DIR}")
|
||||||
find_library(CUDNN_LIBRARY NAMES cudnn cudnn8 cudnn7
|
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} $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.0 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.1 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.2 $ENV{CUDA_PATH}/../../../NVIDIA/CUDNN/v9.3 /usr/lib/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/ /usr/
|
HINTS ${CUDA_TOOLKIT_ROOT} $ENV{CUDA_PATH} $ENV{CUDA_TOOLKIT_ROOT_DIR} $ENV{cudnn} $ENV{CUDNN} $ENV{CUDNN_ROOT_DIR} ${CUDNN_VERSION_DIRS} /usr/lib/x86_64-linux-gnu/ /usr/include/aarch64-linux-gnu/ /usr/
|
||||||
PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64 lib/11.8/x64 lib/12.0/x64 lib/12.1/x64 lib/12.2/x64 lib/12.3/x64 lib/12.4/x64 lib/12.5/x64 lib/12.6/x64)
|
PATH_SUFFIXES lib lib64 cuda/lib cuda/lib64 lib/x64 cuda/lib/x64 lib/11.8/x64 lib/12.0/x64 lib/12.1/x64 lib/12.2/x64 lib/12.3/x64 lib/12.4/x64 lib/12.5/x64 lib/12.6/x64)
|
||||||
message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}")
|
message(STATUS "CUDNN_LIBRARY: ${CUDNN_LIBRARY}")
|
||||||
if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
|
if(EXISTS "${CUDNN_INCLUDE_DIR}/cudnn.h")
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "cudnn",
|
"name": "cudnn",
|
||||||
"version": "7.6.5",
|
"version": "7.6.5",
|
||||||
"port-version": 13,
|
"port-version": 14,
|
||||||
"description": "NVIDIA's cuDNN deep neural network acceleration library.",
|
"description": "NVIDIA's cuDNN deep neural network acceleration library.",
|
||||||
"homepage": "https://developer.nvidia.com/cudnn",
|
"homepage": "https://developer.nvidia.com/cudnn",
|
||||||
"license": null,
|
"license": null,
|
||||||
|
|
|
@ -2114,7 +2114,7 @@
|
||||||
},
|
},
|
||||||
"cudnn": {
|
"cudnn": {
|
||||||
"baseline": "7.6.5",
|
"baseline": "7.6.5",
|
||||||
"port-version": 13
|
"port-version": 14
|
||||||
},
|
},
|
||||||
"cunit": {
|
"cunit": {
|
||||||
"baseline": "2.1.3",
|
"baseline": "2.1.3",
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "8e17b3aaaea3a6da5858cb6202c3e2cd8e9f9a5e",
|
||||||
|
"version": "7.6.5",
|
||||||
|
"port-version": 14
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "92d21a780ad42ae4fa7aaf9481d8a43a832d6e4c",
|
"git-tree": "92d21a780ad42ae4fa7aaf9481d8a43a832d6e4c",
|
||||||
"version": "7.6.5",
|
"version": "7.6.5",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче