Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7487 from StevenPuttemans:add_compute_capabilities

Browse Source
pull/7496/head
Alexander Alekhin 8 years ago
parent 9c6d063750 fa32abe5f3
commit e2e1485373
1 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      cmake/OpenCVDetectCUDA.cmake

8
cmake/OpenCVDetectCUDA.cmake
Unescape View File

@ -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)
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()

Write Preview
Loading…
Cancel
Save