diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-09-24 21:58:38 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-24 12:58:38 -0700 |
| commit | 3532a7cf3cb81ad4c56775a2b02039ee77a96eb2 (patch) | |
| tree | 4b75fb74ca896434453d3bcd2f8420254ba1d15c /ports/cuda | |
| parent | e9047ef77133cde979dc9594d089e0109702675e (diff) | |
| download | vcpkg-3532a7cf3cb81ad4c56775a2b02039ee77a96eb2.tar.gz vcpkg-3532a7cf3cb81ad4c56775a2b02039ee77a96eb2.zip | |
[cudnn] add port and enable it in darknet (#7536)
* [cudnn] add port and enable it in darknet
* [OpenCV4] fix ffmpeg feature on uwp
* [darknet] enable integration with cuda/cudnn also with opencv3
* [darknet] update to latest revision
Diffstat (limited to 'ports/cuda')
| -rw-r--r-- | ports/cuda/CONTROL | 4 | ||||
| -rw-r--r-- | ports/cuda/portfile.cmake | 23 |
2 files changed, 13 insertions, 14 deletions
diff --git a/ports/cuda/CONTROL b/ports/cuda/CONTROL index 271869e8b..ba5208c2f 100644 --- a/ports/cuda/CONTROL +++ b/ports/cuda/CONTROL @@ -1,3 +1,3 @@ Source: cuda -Version: 9.0 -Description: A parallel computing platform and programming model
\ No newline at end of file +Version: 10.1 +Description: A parallel computing platform and programming model diff --git a/ports/cuda/portfile.cmake b/ports/cuda/portfile.cmake index 7cc1773db..63e3f9cee 100644 --- a/ports/cuda/portfile.cmake +++ b/ports/cuda/portfile.cmake @@ -1,4 +1,4 @@ -# Due to the complexity involved, this package doesn't install CUDA. It instead verifies that CUDA is installed. +# This package doesn't install CUDA. It instead verifies that CUDA is installed. # Other packages can depend on this package to declare a dependency on CUDA. # If this package is installed, we assume that CUDA is properly installed. @@ -9,8 +9,7 @@ find_program(NVCC ENV CUDA_BIN_PATH PATH_SUFFIXES bin bin64 DOC "Toolkit location." - NO_DEFAULT_PATH - ) + NO_DEFAULT_PATH) set(error_code 1) if (NVCC) @@ -20,12 +19,12 @@ if (NVCC) RESULT_VARIABLE error_code) endif() -set(CUDA_REQUIRED_VERSION "V9.0.0") +#note: this port must be kept in sync with CUDNN port: every time one is upgraded, the other must be too +set(CUDA_REQUIRED_VERSION "V10.1.0") if (error_code) - message(FATAL_ERROR "Could not find CUDA. Before continuing, please download and install CUDA (${CUDA_REQUIRED_VERSION} or higher) from:" - "\n https://developer.nvidia.com/cuda-downloads\n" - "\nAlso ensure vcpkg has been rebuilt with the latest version (v0.0.104 or later)") + message(FATAL_ERROR "Could not find CUDA. Before continuing, please download and install CUDA (${CUDA_REQUIRED_VERSION} or higher) from:" + "\n https://developer.nvidia.com/cuda-downloads\n") endif() # Sample output: @@ -36,12 +35,12 @@ endif() string(REGEX MATCH "V([0-9]+)\\.([0-9]+)\\.([0-9]+)" CUDA_VERSION ${NVCC_OUTPUT}) message(STATUS "Found CUDA ${CUDA_VERSION}") set(CUDA_VERSION_MAJOR ${CMAKE_MATCH_1}) -#set(CUDA_VERSION_MINOR ${CMAKE_MATCH_2}) -#set(CUDA_VERSION_PATCH ${CMAKE_MATCH_3}) +set(CUDA_VERSION_MINOR ${CMAKE_MATCH_2}) +set(CUDA_VERSION_PATCH ${CMAKE_MATCH_3}) -if (CUDA_VERSION_MAJOR LESS 9) - message(FATAL_ERROR "CUDA ${CUDA_VERSION} but ${CUDA_REQUIRED_VERSION} is required. Please download and install a more recent version of CUDA from:" +if (CUDA_VERSION_MAJOR LESS 10 AND CUDA_VERSION_MINOR LESS 1) + message(FATAL_ERROR "CUDA ${CUDA_VERSION} found, but ${CUDA_REQUIRED_VERSION} is required. Please download and install a more recent version of CUDA from:" "\n https://developer.nvidia.com/cuda-downloads\n") endif() -SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file +SET(VCPKG_POLICY_EMPTY_PACKAGE enabled) |