Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-18 18:15:44 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'properly_specify_fermi_when_cuda_autodetect_fails'

Browse Source 
19dc5672 Correct CUDA fallback to "fermi" when trying to do auto detection.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !353
This commit is contained in:
Robert Maynard 2016-03-11 10:04:51 -05:00 committed by Kitware Robot
commit b8f28d6dee
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMake/UseVTKmCUDA.cmake
View File

@ -107,8 +107,11 @@ if (VTKm_Base_FOUND)
"Falling back to fermi, please manually specify if you want something else.")
set(VTKm_CUDA_Architecture "fermi")
endif()
endif()
elseif(VTKm_CUDA_Architecture STREQUAL "fermi")
#since when we are native we can fail, and fall back to "fermi" these have
#to happen after, and separately of the native check
if(VTKm_CUDA_Architecture STREQUAL "fermi")
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} --generate-code arch=compute_20,code=compute_20")
elseif(VTKm_CUDA_Architecture STREQUAL "kepler")
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} --generate-code arch=compute_30,code=compute_30")