Commit 02567c5d authored by Robert Maynard's avatar Robert Maynard Committed by Kitware Robot
Browse files

Merge topic 'reenable_particle_advection'

cd636764

 ParticeAdvection for cuda <= 9 now built without ptxas optimizations
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !1435
parents cb477147 cd636764
......@@ -94,9 +94,10 @@ if (TARGET vtkm::openmp)
vtkm_unit_tests(NAME Worklets BACKEND OPENMP SOURCES ${unit_tests})
endif()
if (TARGET vtkm::cuda)
# TODO: This test has been temporarily removed from CUDA because of problems with the compiler.
# This should be re-added (i.e. the line taking the test out removed) as soon as the issues with
# the compiler are resolved.
list(REMOVE_ITEM unit_tests UnitTestParticleAdvection.cxx)
vtkm_unit_tests(NAME Worklets BACKEND CUDA SOURCES ${unit_tests})
if(CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 10.0.0)
set(particle_cuda_src "${CMAKE_CURRENT_BINARY_DIR}/UnitTestParticleAdvection.cu")
set_source_files_properties(${particle_cuda_src} PROPERTIES COMPILE_FLAGS "-Xptxas --opt-level=0")
endif()
endif()
Supports Markdown
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