Update examples and benchmarks to use new VTK-m CMake helper function
This commit is contained in:
parent
ea50e82aac
commit
28484fc6aa
@ -22,16 +22,10 @@ function(add_benchmark)
|
||||
set_target_properties(${exe_name} PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY ${VTKm_EXECUTABLE_OUTPUT_PATH}
|
||||
CXX_VISIBILITY_PRESET "hidden"
|
||||
CUDA_VISIBILITY_PRESET "hidden"
|
||||
CUDA_SEPARABLE_COMPILATION ON
|
||||
)
|
||||
|
||||
set_property(TARGET ${exe_name} PROPERTY "hidden")
|
||||
if (TARGET vtkm::cuda)
|
||||
set_source_files_properties(${VTKm_AB_FILE} PROPERTIES LANGUAGE "CUDA")
|
||||
set_target_properties(${exe_name} PROPERTIES
|
||||
CUDA_VISIBILITY_PRESET "hidden"
|
||||
CUDA_SEPARABLE_COMPILATION ON
|
||||
)
|
||||
endif()
|
||||
vtkm_add_target_information(${exe_name} DEVICE_SOURCES ${VTKm_AB_FILE})
|
||||
endfunction()
|
||||
|
||||
set(benchmarks
|
||||
@ -45,7 +39,7 @@ set(benchmarks
|
||||
)
|
||||
|
||||
foreach (benchmark ${benchmarks})
|
||||
add_benchmark(NAME ${benchmark} FILE ${benchmark}.cxx LIBS vtkm_filter vtkm_cont)
|
||||
add_benchmark(NAME ${benchmark} FILE ${benchmark}.cxx LIBS vtkm_filter)
|
||||
endforeach ()
|
||||
|
||||
if(TARGET vtkm_rendering)
|
||||
|
@ -16,6 +16,6 @@ find_package(VTKm REQUIRED QUIET)
|
||||
add_executable(Clipping Clipping.cxx)
|
||||
target_link_libraries(Clipping PRIVATE vtkm_filter)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(Clipping.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
vtkm_add_target_information(Clipping
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES Clipping.cxx)
|
||||
|
@ -16,9 +16,12 @@ find_package(VTKm REQUIRED QUIET)
|
||||
add_executable(ContourTreeMesh2D ContourTreeMesh2D.cxx)
|
||||
target_link_libraries(ContourTreeMesh2D vtkm_filter)
|
||||
|
||||
vtkm_add_target_information(ContourTreeMesh2D
|
||||
DEVICE_SOURCES ContourTreeMesh2D.cxx)
|
||||
|
||||
add_executable(ContourTreeMesh3D ContourTreeMesh3D.cxx)
|
||||
target_link_libraries(ContourTreeMesh3D vtkm_filter)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(ContourTreeMesh2D.cxx ContourTreeMesh3D.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
vtkm_add_target_information(ContourTreeMesh3D
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES ContourTreeMesh3D.cxx)
|
||||
|
@ -56,7 +56,9 @@ find_package(VTKm REQUIRED QUIET)
|
||||
|
||||
add_executable(ContourTree ContourTreeApp.cxx)
|
||||
target_link_libraries(ContourTree vtkm_filter)
|
||||
|
||||
vtkm_add_target_information(ContourTree
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES ContourTreeApp.cxx)
|
||||
|
||||
####################################
|
||||
# Debug algorithm build
|
||||
@ -67,7 +69,3 @@ if(TARGET vtkm::tbb)
|
||||
# TBB 2D/3D/MC
|
||||
target_compile_definitions(ContourTree PRIVATE ENABLE_SET_NUM_THREADS)
|
||||
endif()
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(ContourTreeApp.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
|
@ -18,6 +18,9 @@ add_executable(CosmoHaloFinder CosmoHaloFinder.cxx)
|
||||
target_link_libraries(CosmoCenterFinder PRIVATE vtkm_filter)
|
||||
target_link_libraries(CosmoHaloFinder PRIVATE vtkm_filter)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(CosmoCenterFinder.cxx CosmoCenterFinder.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
vtkm_add_target_information(CosmoCenterFinder
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES CosmoCenterFinder.cxx)
|
||||
vtkm_add_target_information(CosmoHaloFinder
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES CosmoHaloFinder.cxx)
|
||||
|
@ -13,13 +13,10 @@ project(VTKmDemo CXX)
|
||||
#Find the VTK-m package
|
||||
find_package(VTKm REQUIRED QUIET)
|
||||
|
||||
|
||||
if(TARGET vtkm_rendering)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(Demo.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
|
||||
add_executable(Demo Demo.cxx)
|
||||
target_link_libraries(Demo PRIVATE vtkm_rendering)
|
||||
vtkm_add_target_information(Demo
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES Demo.cxx)
|
||||
endif()
|
||||
|
@ -19,8 +19,8 @@ if(TARGET OpenGL::GL AND
|
||||
TARGET GLEW::GLEW)
|
||||
|
||||
add_executable(GameOfLife GameOfLife.cxx LoadShaders.h)
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(GameOfLife.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
target_link_libraries(GameOfLife PRIVATE vtkm_filter OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
||||
vtkm_add_target_information(GameOfLife
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES GameOfLife.cxx)
|
||||
endif()
|
||||
|
@ -21,9 +21,9 @@ if(TARGET OpenGL::GL AND
|
||||
set(gl_libs OpenGL::GL GLEW::GLEW GLUT::GLUT)
|
||||
|
||||
add_executable(HelloWorld HelloWorld.cxx LoadShaders.h)
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(HelloWorld.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
target_link_libraries(HelloWorld PRIVATE vtkm_filter ${gl_libs})
|
||||
vtkm_add_target_information(HelloWorld
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES HelloWorld.cxx)
|
||||
|
||||
endif()
|
||||
|
@ -15,8 +15,7 @@ find_package(VTKm REQUIRED QUIET)
|
||||
if (VTKm_ENABLE_MPI)
|
||||
add_executable(Histogram Histogram.cxx HistogramMPI.h HistogramMPI.hxx)
|
||||
target_link_libraries(Histogram PRIVATE vtkm_filter)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(Histogram.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
vtkm_add_target_information(Histogram
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES Histogram.cxx)
|
||||
endif()
|
||||
|
@ -21,9 +21,8 @@ if(TARGET OpenGL::GL AND
|
||||
set(gl_libs OpenGL::GL OpenGL::GLU GLEW::GLEW GLUT::GLUT)
|
||||
add_executable(IsosurfaceUniformGrid IsosurfaceUniformGrid.cxx quaternion.h)
|
||||
target_link_libraries(IsosurfaceUniformGrid PRIVATE vtkm_filter ${gl_libs})
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(IsosurfaceUniformGrid.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
vtkm_add_target_information(IsosurfaceUniformGrid
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES IsosurfaceUniformGrid.cxx)
|
||||
|
||||
endif()
|
||||
|
@ -12,9 +12,8 @@ cmake_minimum_required(VERSION 3.8...3.14 FATAL_ERROR)
|
||||
#Find the VTK-m package
|
||||
find_package(VTKm REQUIRED QUIET)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(lagrangian.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
|
||||
add_executable(Lagrangian lagrangian.cxx ABCfield.h)
|
||||
target_link_libraries(Lagrangian PRIVATE vtkm_filter)
|
||||
vtkm_add_target_information(Lagrangian
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES Lagrangian.cxx)
|
||||
|
@ -29,9 +29,8 @@ set(srcs
|
||||
MultiBackend.cxx
|
||||
)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(${device_srcs} PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
|
||||
add_executable(MultiBackend ${device_srcs} ${srcs} ${headers})
|
||||
target_link_libraries(MultiBackend PRIVATE vtkm_filter Threads::Threads)
|
||||
vtkm_add_target_information(MultiBackend
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES ${device_srcs})
|
||||
|
@ -13,9 +13,8 @@ project(Oscillator CXX)
|
||||
#Find the VTK-m package
|
||||
find_package(VTKm REQUIRED QUIET)
|
||||
|
||||
if (TARGET vtkm::cuda)
|
||||
set_source_files_properties(Oscillator.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
|
||||
add_executable(Oscillator Oscillator.cxx)
|
||||
target_link_libraries(Oscillator PRIVATE vtkm_filter)
|
||||
vtkm_add_target_information(Oscillator
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES Oscillator.cxx)
|
||||
|
@ -15,11 +15,9 @@ find_package(VTKm REQUIRED QUIET)
|
||||
|
||||
add_executable(Particle_Advection ParticleAdvection.cxx)
|
||||
target_link_libraries(Particle_Advection PRIVATE vtkm_filter)
|
||||
|
||||
vtkm_add_target_information(Particle_Advection
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES ParticleAdvection.cxx)
|
||||
if(TARGET vtkm::tbb)
|
||||
target_compile_definitions(Particle_Advection PRIVATE BUILDING_TBB_VERSION)
|
||||
endif()
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(ParticleAdvection.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
|
@ -14,7 +14,6 @@ project(RedistributePoints CXX)
|
||||
find_package(VTKm REQUIRED QUIET)
|
||||
add_executable(RedistributePoints RedistributePoints.cxx RedistributePoints.h)
|
||||
target_link_libraries(RedistributePoints PRIVATE vtkm_filter)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(RedistributePoints.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
vtkm_add_target_information(RedistributePoints
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES RedistributePoints.cxx)
|
||||
|
@ -22,9 +22,7 @@ if(TARGET OpenGL::GL AND
|
||||
|
||||
add_executable(StreamLineUniformGrid StreamLineUniformGrid.cxx)
|
||||
target_link_libraries(StreamLineUniformGrid PRIVATE vtkm_filter ${gl_libs})
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(StreamLineUniformGrid.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
|
||||
vtkm_add_target_information(StreamLineUniformGrid
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES StreamLineUniformGrid.cxx)
|
||||
endif()
|
||||
|
@ -16,9 +16,8 @@ find_package(VTKm REQUIRED QUIET)
|
||||
if(TARGET vtkm_rendering)
|
||||
|
||||
add_executable(Tau_timing TauTiming.cxx)
|
||||
vtkm_add_target_information(Tau_timing
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES TauTiming.cxx)
|
||||
target_link_libraries(Tau_timing vtkm_cont)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(TauTiming.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
endif()
|
||||
|
@ -16,8 +16,7 @@ project(TemporalAdvection CXX)
|
||||
find_package(VTKm REQUIRED QUIET)
|
||||
|
||||
add_executable(Temporal_Advection TemporalAdvection.cxx)
|
||||
vtkm_add_target_information(Temporal_Advection
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES TemporalAdvection.cxx)
|
||||
target_link_libraries(Temporal_Advection PRIVATE vtkm_filter)
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(TemporalAdvection.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
|
@ -30,11 +30,17 @@ if(TARGET OpenGL::GL AND
|
||||
target_link_libraries(TetrahedralizeUniformGrid PRIVATE vtkm_filter ${gl_libs})
|
||||
target_link_libraries(TriangulateUniformGrid PRIVATE vtkm_filter ${gl_libs})
|
||||
|
||||
if(TARGET vtkm::cuda)
|
||||
set_source_files_properties(TetrahedralizeExplicitGrid.cxx
|
||||
TriangulateExplicitGrid.cxx
|
||||
TetrahedralizeUniformGrid.cxx
|
||||
TriangulateUniformGrid.cxx PROPERTIES LANGUAGE "CUDA")
|
||||
endif()
|
||||
vtkm_add_target_information(TetrahedralizeExplicitGrid
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES TetrahedralizeExplicitGrid.cxx)
|
||||
vtkm_add_target_information(TriangulateExplicitGrid
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES TriangulateExplicitGrid.cxx)
|
||||
vtkm_add_target_information(TetrahedralizeUniformGrid
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES TetrahedralizeUniformGrid.cxx)
|
||||
vtkm_add_target_information(TriangulateUniformGrid
|
||||
MODIFY_CUDA_FLAGS
|
||||
DEVICE_SOURCES TriangulateUniformGrid.cxx)
|
||||
|
||||
endif()
|
||||
|
@ -16,5 +16,6 @@ find_package(VTKm REQUIRED QUIET)
|
||||
if(TARGET vtkm::cuda)
|
||||
add_executable(UnifiedMemory_CUDA UnifiedMemory.cu)
|
||||
target_link_libraries(UnifiedMemory_CUDA PRIVATE vtkm_filter)
|
||||
vtkm_add_target_information(UnifiedMemory_CUDA MODIFY_CUDA_FLAGS)
|
||||
endif()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user