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

Merge branch 'properly_cache_cuda_native_flags' into 'master'

Browse Source 
Properly cache the results of CUDA native detection.

I found some issues when using VTK-m from inside VTK. The issues where
that on reconfigures the device architectures flags where dropped by the
caching mechanism.

See merge request !555
This commit is contained in:
Robert Maynard 2016-09-19 16:30:03 -04:00
commit 5c7c546c86
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMake/VTKmConfigureComponents.cmake
View File

@ -306,7 +306,11 @@ macro(vtkm_configure_component_CUDA)
#detect what the propery is set too
if(VTKm_CUDA_Architecture STREQUAL "native")
if(NOT VTKM_CUDA_NATIVE_EXE_PROCESS_RAN)
if(VTKM_CUDA_NATIVE_EXE_PROCESS_RAN_OUTPUT)
#Use the cached value
list(APPEND CUDA_NVCC_FLAG S{VTKM_CUDA_NATIVE_EXE_PROCESS_RAN_OUTPUT})
else()
#run execute_process to do auto_detection
if(CMAKE_GENERATOR MATCHES "Visual Studio")
@ -326,9 +330,10 @@ macro(vtkm_configure_component_CUDA)
#run output
string(FIND "${run_output}" "--generate-code" position)
string(SUBSTRING "${run_output}" ${position} -1 run_output)
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} ${run_output}")
set(VTKM_CUDA_NATIVE_EXE_PROCESS_RAN TRUE CACHE INTERNAL
"We have correctly detected the device type(s) for cuda[native]")
list(APPEND CUDA_NVCC_FLAG S{run_output})
set(VTKM_CUDA_NATIVE_EXE_PROCESS_RAN_OUTPUT ${run_output} CACHE INTERNAL
"device type(s) for cuda[native]")
else()
set(VTKm_CUDA_Architecture "fermi")
vtkm_configure_component_message(