generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update CUDA architecture flags initialization

Browse Source 
* remove obsolete paths
* add Pascal arch support
This commit is contained in:
Vladislav Vinogradov 2016-07-13 13:03:16 +03:00
parent 112903c2bd
commit d76f258aeb
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmake/OpenCVDetectCUDA.cmake
View File

@ -43,7 +43,7 @@ if(CUDA_FOUND)
message(STATUS "CUDA detected: " ${CUDA_VERSION}) message(STATUS "CUDA detected: " ${CUDA_VERSION})
set(_generations "Fermi" "Kepler") set(_generations "Fermi" "Kepler" "Maxwell" "Pascal")
if(NOT CMAKE_CROSSCOMPILING) if(NOT CMAKE_CROSSCOMPILING)
list(APPEND _generations "Auto") list(APPEND _generations "Auto")
endif() endif()
@ -63,13 +63,13 @@ if(CUDA_FOUND)
set(__cuda_arch_ptx "") set(__cuda_arch_ptx "")
if(CUDA_GENERATION STREQUAL "Fermi") if(CUDA_GENERATION STREQUAL "Fermi")
set(__cuda_arch_bin "2.0 2.1(2.0)") set(__cuda_arch_bin "2.0")
elseif(CUDA_GENERATION STREQUAL "Kepler") elseif(CUDA_GENERATION STREQUAL "Kepler")
if(${CUDA_VERSION} VERSION_LESS "5.0") set(__cuda_arch_bin "3.0 3.5")
set(__cuda_arch_bin "3.0") elseif(CUDA_GENERATION STREQUAL "Maxwell")
else() set(__cuda_arch_bin "5.0")
set(__cuda_arch_bin "3.0 3.5") elseif(CUDA_GENERATION STREQUAL "Pascal")
endif() set(__cuda_arch_bin "6.0")
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/"
@ -91,14 +91,12 @@ if(CUDA_FOUND)
set(__cuda_arch_bin "5.3") set(__cuda_arch_bin "5.3")
set(__cuda_arch_ptx "") set(__cuda_arch_ptx "")
else() else()
if(${CUDA_VERSION} VERSION_LESS "5.0") if(${CUDA_VERSION} VERSION_LESS "8.0")
set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0") set(__cuda_arch_bin "2.0 3.0 3.5 5.0")
elseif(${CUDA_VERSION} VERSION_GREATER "6.5")
set(__cuda_arch_bin "2.0 2.1(2.0) 3.0 3.5")
else() else()
set(__cuda_arch_bin "1.1 1.2 1.3 2.0 2.1(2.0) 3.0 3.5") set(__cuda_arch_bin "2.0 3.0 3.5 5.0 6.0")
endif() endif()
set(__cuda_arch_ptx "3.0") set(__cuda_arch_ptx "")
endif() endif()
endif() endif()