From 05bda64c92d0850f6f5195f20b56e73b68efba21 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Fri, 29 Jan 2021 08:30:06 +0100 Subject: [PATCH] Update vcpkg refs to OpenCV 4.5.1 --- .github/workflows/ccpp.yml | 6 +++--- CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index a510a398..a0be9c89 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -107,7 +107,7 @@ jobs: with: setupOnly: true vcpkgDirectory: '${{ github.workspace }}/vcpkg' - vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88' + vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2' appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }} vcpkgTriplet: 'x64-linux' additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed @@ -284,7 +284,7 @@ jobs: with: setupOnly: true vcpkgDirectory: '${{ github.workspace }}/vcpkg' - vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88' + vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2' appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }} vcpkgTriplet: 'x64-osx' additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed @@ -402,7 +402,7 @@ jobs: with: setupOnly: true vcpkgDirectory: '${{ github.workspace }}/vcpkg' - vcpkgGitCommitId: 'e4ce66eecfd3e5cca5eac06c971921bf8e37cf88' + vcpkgGitCommitId: '865de0c130f3d34174ac7a410789df3c44a27fd2' appendedCacheKey: ${{ hashFiles( '**/vcpkg.json' ) }} vcpkgTriplet: 'x64-windows' additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed diff --git a/CMakeLists.txt b/CMakeLists.txt index a5a3a6ab..05496258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,10 +113,10 @@ if(ENABLE_CUDA) 80 IN_LIST CMAKE_CUDA_ARCHITECTURES OR 86 IN_LIST CMAKE_CUDA_ARCHITECTURES) set(ENABLE_CUDNN_HALF "TRUE" CACHE BOOL "Enable CUDNN Half precision" FORCE) - message(STATUS "Your setup supports half precision (it requires CC >= 7.0)") + message(STATUS "Your setup supports half precision (CUDA_ARCHITECTURES >= 70)") else() set(ENABLE_CUDNN_HALF "FALSE" CACHE BOOL "Enable CUDNN Half precision" FORCE) - message(STATUS "Your setup does not support half precision (it requires CC >= 7.0)") + message(STATUS "Your setup does not support half precision (it requires CUDA_ARCHITECTURES >= 70)") endif() endif() if(BUILD_SHARED_LIBS)