Merge topic 'add_kokkos_backend'

5eb16852 Changing VTK-m backend initialization while using Kokkos
f47258be Fixing Kokkos relocatable device code error with desul atomics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Vicente Bolea <vicente.bolea@kitware.com>
Merge-request: !10853

Accelerators/Vtkm/Core/CMakeLists.txt

@@ -43,22 +43,26 @@ vtkm_add_target_information(${vtkm_accel_target}
                             DEVICE_SOURCES ${sources})
 
 list(TRANSFORM nowrap_classes APPEND ".cxx" OUTPUT_VARIABLE device_sources)
-if (TARGET vtkm::cuda OR  TARGET vtkm::kokkos_cuda)
+if (TARGET vtkm::cuda)
   # Temporarily suppress "has address taken but no possible call to it" warnings,
   # until we figure out its implications.
   # We are disabling all warnings as nvlink has no known way to suppress
   # individual warning types.
   string(APPEND CMAKE_CUDA_FLAGS " -Xnvlink -w")
   set_source_files_properties(${device_sources} PROPERTIES LANGUAGE CUDA)
-
   vtk_module_set_properties(VTK::AcceleratorsVTKmCore CUDA_SEPARABLE_COMPILATION ON)
 
+elseif (TARGET vtkm::kokkos_cuda)
+  add_compile_definitions(VTK_USE_KOKKOS)
+  set_source_files_properties(${device_sources} PROPERTIES LANGUAGE CUDA)
+  kokkos_compilation(SOURCE ${device_sources})
+
 elseif (TARGET vtkm::kokkos_hip)
+  add_compile_definitions(VTK_USE_KOKKOS)
   set_source_files_properties(${device_sources} PROPERTIES LANGUAGE HIP)
   kokkos_compilation(SOURCE ${device_sources})
 endif ()
 
-
 if (MSVC)
   set(msvc_warning_flags
     # Generates numerous false positives with template code about unreachable

Accelerators/Vtkm/Core/vtkmlib/vtkmInitializer.cxx

@@ -9,8 +9,8 @@
 VTK_ABI_NAMESPACE_BEGIN
 void InitializeVTKm()
 {
-// Only Kokkos HIP backend needs to be initialized
-#ifdef VTKM_HIP
+// Kokkos enabled devices needs to be initialized
+#ifdef VTK_USE_KOKKOS
   static bool isInitialized{ false };
   if (!isInitialized)
   {

Accelerators/Vtkm/DataModel/CMakeLists.txt

@@ -48,7 +48,7 @@ vtkm_add_target_information(${vtkm_accel_target}
                             MODIFY_CUDA_FLAGS
                             DEVICE_SOURCES ${sources})
 
-if (TARGET vtkm::cuda OR TARGET vtkm::kokkos_cuda)
+if (TARGET vtkm::cuda)
   # Temporarily suppress "has address taken but no possible call to it" warnings,
   # until we figure out its implications.
   # We are disabling all warnings as nvlink has no known way to suppress
@@ -59,12 +59,18 @@ if (TARGET vtkm::cuda OR TARGET vtkm::kokkos_cuda)
   set(cuda_impl ${nowrap_sources} vtkmDataSet.cxx)
   set_source_files_properties(${cuda_impl} PROPERTIES LANGUAGE CUDA)
 
-  vtk_module_set_properties(VTK::AcceleratorsVTKmDataModel
-    CUDA_SEPARABLE_COMPILATION ON)
+  vtk_module_set_properties(VTK::AcceleratorsVTKmDataModel CUDA_SEPARABLE_COMPILATION ON)
 
   vtk_module_compile_options(VTK::AcceleratorsVTKmDataModel
     PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=extra_semicolon>)
-endif ()
+
+elseif (TARGET vtkm::kokkos_cuda)
+  list(TRANSFORM nowrap_classes APPEND ".cxx" OUTPUT_VARIABLE nowrap_sources)
+  set(cuda_impl ${nowrap_sources} vtkmDataSet.cxx)
+  set_source_files_properties(${cuda_impl} PROPERTIES LANGUAGE CUDA)
+  kokkos_compilation(SOURCE ${cuda_impl})
+
+endif()
 
 if (MSVC)
   set(msvc_warning_flags

Accelerators/Vtkm/Filters/CMakeLists.txt

@@ -106,7 +106,7 @@ vtkm_add_target_information(${vtkm_accel_target}
                             MODIFY_CUDA_FLAGS
                             DEVICE_SOURCES ${sources})
 
-if (TARGET vtkm::cuda OR TARGET vtkm::kokkos_cuda)
+if (TARGET vtkm::cuda)
   # Temporarily suppress "has address taken but no possible call to it" warnings,
   # until we figure out its implications.
   # We are disabling all warnings as nvlink has no known way to suppress
@@ -115,13 +115,17 @@ if (TARGET vtkm::cuda OR TARGET vtkm::kokkos_cuda)
 
   list(TRANSFORM classes APPEND ".cxx" OUTPUT_VARIABLE cuda_impl)
   set_source_files_properties(${cuda_impl} PROPERTIES LANGUAGE CUDA)
-
-  vtk_module_set_properties(VTK::AcceleratorsVTKmFilters
-    CUDA_SEPARABLE_COMPILATION ON)
+  vtk_module_set_properties(VTK::AcceleratorsVTKmFilters CUDA_SEPARABLE_COMPILATION ON)
 
   vtk_module_compile_options(VTK::AcceleratorsVTKmFilters
     PUBLIC $<$<COMPILE_LANGUAGE:CUDA>:-Xcudafe --diag_suppress=extra_semicolon>)
-endif ()
+elseif (TARGET vtkm::kokkos_cuda)
+
+  list(TRANSFORM classes APPEND ".cxx" OUTPUT_VARIABLE cuda_impl)
+  set_source_files_properties(${cuda_impl} PROPERTIES LANGUAGE CUDA)
+  kokkos_compilation(SOURCE ${cuda_impl})
+
+endif()
 
 if (MSVC)
   set(msvc_warning_flags