Skip to content

O
opencv
Commit e2e14853 authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #7487 from StevenPuttemans:add_compute_capabilities

parents 9c6d0637 fa32abe5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cmake/OpenCVDetectCUDA.cmake
View file @ e2e14853
...@@ -67,9 +67,9 @@ if(CUDA_FOUND) ...@@ -67,9 +67,9 @@ if(CUDA_FOUND)
elseif(CUDA_GENERATION STREQUAL "Kepler") elseif(CUDA_GENERATION STREQUAL "Kepler")
set(__cuda_arch_bin "3.0 3.5 3.7") set(__cuda_arch_bin "3.0 3.5 3.7")
elseif(CUDA_GENERATION STREQUAL "Maxwell") elseif(CUDA_GENERATION STREQUAL "Maxwell")
set(__cuda_arch_bin "5.0") set(__cuda_arch_bin "5.0 5.2")
elseif(CUDA_GENERATION STREQUAL "Pascal") elseif(CUDA_GENERATION STREQUAL "Pascal")
set(__cuda_arch_bin "6.0") set(__cuda_arch_bin "6.0 6.1")
elseif(CUDA_GENERATION STREQUAL "Auto") elseif(CUDA_GENERATION STREQUAL "Auto")
execute_process( COMMAND "${CUDA_NVCC_EXECUTABLE}" "${OpenCV_SOURCE_DIR}/cmake/checks/OpenCVDetectCudaArch.cu" "--run" execute_process( COMMAND "${CUDA_NVCC_EXECUTABLE}" "${OpenCV_SOURCE_DIR}/cmake/checks/OpenCVDetectCudaArch.cu" "--run"
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/" WORKING_DIRECTORY "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/"
...@@ -92,9 +92,9 @@ if(CUDA_FOUND) ...@@ -92,9 +92,9 @@ if(CUDA_FOUND)
set(__cuda_arch_ptx "") set(__cuda_arch_ptx "")
else() else()
if(${CUDA_VERSION} VERSION_LESS "8.0") if(${CUDA_VERSION} VERSION_LESS "8.0")
set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0") set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 5.2")
else() else()
set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 6.0") set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 5.2 6.0 6.1")
endif() endif()
set(__cuda_arch_ptx "") set(__cuda_arch_ptx "")
endif() endif()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment