Commit 403bca94 authored by Allison Vacanti's avatar Allison Vacanti Committed by Kitware Robot

Merge topic 'error_on_cuda_flag_detect_failure'

5af957ec Error out when native CUDA flag detection fails.
Acked-by: Kitware Robot's avatarKitware Robot <>
Acked-by: Robert Maynard's avatarRobert Maynard <>
Merge-request: !1738
parents 77f17450 5af957ec
...@@ -216,13 +216,11 @@ if(VTKm_ENABLE_CUDA) ...@@ -216,13 +216,11 @@ if(VTKm_ENABLE_CUDA)
"device type(s) for cuda[native]") "device type(s) for cuda[native]")
else() else()
set(VTKm_CUDA_Architecture "kepler") message(FATAL_ERROR "Error detecting architecture flags for CUDA. Please set VTKm_CUDA_Architecture manually.")
endif() endif()
endif() endif()
endif() endif()
#since when we are native we can fail, and fall back to "kepler" these have
#to happen after, and separately of the native check
if(VTKm_CUDA_Architecture STREQUAL "fermi") if(VTKm_CUDA_Architecture STREQUAL "fermi")
set(arch_flags --generate-code=arch=compute_20,code=sm_20) set(arch_flags --generate-code=arch=compute_20,code=sm_20)
elseif(VTKm_CUDA_Architecture STREQUAL "kepler") elseif(VTKm_CUDA_Architecture STREQUAL "kepler")
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