Updates will be applied April 15th at 12pm EDT (UTC-0400). GitLab could be a little slow between 12 - 12:45pm EDT.

Commit b8f28d6d authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot

Merge topic 'properly_specify_fermi_when_cuda_autodetect_fails'

19dc5672 Correct CUDA fallback to "fermi" when trying to do auto detection.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !353
parents ba202cc1 19dc5672
......@@ -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")
......
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