mirror of
https://gitlab.kitware.com/vtk/vtk-m
synced 2024-10-05 01:49:02 +00:00
Merge topic 'fix-rocthrust-dep'
c9ec6ae6a kokkos: let link vtkm_cont to roc::rocthrust Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3160
This commit is contained in:
commit
4e0eb57527
@ -360,10 +360,7 @@ if(VTKm_ENABLE_KOKKOS AND NOT TARGET vtkm_kokkos)
|
|||||||
|
|
||||||
# Make sure rocthrust is available if requested
|
# Make sure rocthrust is available if requested
|
||||||
if(VTKm_ENABLE_KOKKOS_THRUST)
|
if(VTKm_ENABLE_KOKKOS_THRUST)
|
||||||
find_package(rocthrust)
|
find_package(rocthrust REQUIRED CONFIG)
|
||||||
if(NOT rocthrust_FOUND)
|
|
||||||
message(FATAL_ERROR "rocthrust not found. Please set VTKm_ENABLE_KOKKOS_THRUST to OFF.")
|
|
||||||
endif()
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -215,6 +215,11 @@ vtkm_option(VTKm_OVERRIDE_CTEST_TIMEOUT "Disable default ctest timeout" OFF)
|
|||||||
# VTKm_ENABLE_MPI=ON.
|
# VTKm_ENABLE_MPI=ON.
|
||||||
cmake_dependent_option(VTKm_ENABLE_GPU_MPI "Enable GPU AWARE MPI support" OFF "VTKm_ENABLE_MPI" OFF)
|
cmake_dependent_option(VTKm_ENABLE_GPU_MPI "Enable GPU AWARE MPI support" OFF "VTKm_ENABLE_MPI" OFF)
|
||||||
|
|
||||||
|
# By default: Set VTKm_ENABLE_KOKKOS_THRUST to ON if VTKm_ENABLE_KOKKOS is ON, otherwise
|
||||||
|
# disable it (or if the user explicitly turns this option OFF)
|
||||||
|
cmake_dependent_option(VTKm_ENABLE_KOKKOS_THRUST "Enable Kokkos thrust support (only valid with CUDA and HIP)"
|
||||||
|
ON "VTKm_ENABLE_KOKKOS;Kokkos_ENABLE_CUDA OR Kokkos_ENABLE_HIP" OFF)
|
||||||
|
|
||||||
mark_as_advanced(
|
mark_as_advanced(
|
||||||
VTKm_ENABLE_LOGGING
|
VTKm_ENABLE_LOGGING
|
||||||
VTKm_NO_ASSERT
|
VTKm_NO_ASSERT
|
||||||
@ -257,11 +262,6 @@ include(VTKmBuildType)
|
|||||||
# Include the vtk-m wrappers
|
# Include the vtk-m wrappers
|
||||||
include(VTKmWrappers)
|
include(VTKmWrappers)
|
||||||
|
|
||||||
# By default: Set VTKm_ENABLE_KOKKOS_THRUST to ON if VTKm_ENABLE_KOKKOS is ON, otherwise
|
|
||||||
# disable it (or if the user explicitly turns this option OFF)
|
|
||||||
cmake_dependent_option(VTKm_ENABLE_KOKKOS_THRUST "Enable Kokkos thrust support (only valid with CUDA and HIP)"
|
|
||||||
ON "VTKm_ENABLE_KOKKOS;Kokkos_ENABLE_CUDA OR Kokkos_ENABLE_HIP" OFF)
|
|
||||||
|
|
||||||
# Create vtkm_compiler_flags library. This is an interface library that
|
# Create vtkm_compiler_flags library. This is an interface library that
|
||||||
# holds all the C++ compiler flags that are needed for consumers and
|
# holds all the C++ compiler flags that are needed for consumers and
|
||||||
# when building VTK-m.
|
# when building VTK-m.
|
||||||
|
@ -34,6 +34,9 @@ if (TARGET vtkm_kokkos)
|
|||||||
elseif(TARGET vtkm_kokkos_hip)
|
elseif(TARGET vtkm_kokkos_hip)
|
||||||
set_source_files_properties(${sources} TARGET_DIRECTORY vtkm_cont PROPERTIES LANGUAGE HIP)
|
set_source_files_properties(${sources} TARGET_DIRECTORY vtkm_cont PROPERTIES LANGUAGE HIP)
|
||||||
kokkos_compilation(SOURCE ${sources})
|
kokkos_compilation(SOURCE ${sources})
|
||||||
|
if (VTKm_ENABLE_KOKKOS_THRUST)
|
||||||
|
target_link_libraries(vtkm_cont INTERFACE roc::rocthrust)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
else()
|
else()
|
||||||
|
Loading…
Reference in New Issue
Block a user