ci: use nvcc_wrapper in adiosKokkos

ornladios · May 16, 2023 · 7cfe742 · 7cfe742
1 parent 1b9daa5
commit 7cfe742
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 23 deletions.
diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
@@ -177,9 +177,9 @@ endif()
 # Kokkos
 if(ADIOS2_USE_Kokkos)
   if(ADIOS2_USE_Kokkos STREQUAL AUTO)
-    find_package(Kokkos 3.7...<4.0 QUIET)
+    find_package(Kokkos 4.0 QUIET)
   else()
-    find_package(Kokkos 3.7...<4.0 REQUIRED)
+    find_package(Kokkos 4.0 REQUIRED)
   endif()
   if(Kokkos_FOUND)
     set(ADIOS2_HAVE_Kokkos TRUE)

diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt
@@ -126,28 +126,8 @@ endif()
 
 set(maybe_adios2_core_kokkos)
 if(ADIOS2_HAVE_Kokkos)
-  add_library(adios2_core_kokkos helper/adiosKokkos.h helper/adiosKokkos.cpp)
-
-  set_target_properties(adios2_core_kokkos PROPERTIES
-    VISIBILITY_INLINES_HIDDEN ON
-    INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${ADIOS2_SOURCE_DIR}/source>;$<BUILD_INTERFACE:${ADIOS2_BINARY_DIR}/source>"
-    EXPORT_NAME core_kokkos
-    OUTPUT_NAME adios2${ADIOS2_LIBRARY_SUFFIX}_core_kokkos
-    )
-
-  kokkos_compilation(SOURCE helper/adiosKokkos.cpp)
-  if(Kokkos_ENABLE_CUDA)
-    set_property(SOURCE helper/adiosKokkos.cpp PROPERTY LANGUAGE CUDA)
-    set_property(SOURCE helper/adiosKokkos.cpp APPEND PROPERTY COMPILE_FLAGS "--extended-lambda")
-    set_target_properties(adios2_core_kokkos PROPERTIES
-      CUDA_VISIBILITY_PRESET hidden
-      )
-    target_compile_features(adios2_core_kokkos PRIVATE cuda_std_17)
-  endif()
-
-  target_link_libraries(adios2_core_kokkos PRIVATE Kokkos::kokkos)
+  add_subdirectory(helper)
   target_link_libraries(adios2_core PRIVATE adios2_core_kokkos)
-
   set(maybe_adios2_core_kokkos adios2_core_kokkos)
 endif()
 

diff --git a/source/adios2/helper/CMakeLists.txt b/source/adios2/helper/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(CMAKE_CXX_COMPILER "/gpfs/alpine/csc303/scratch/vbolea/kokkos-4.0.00/bin/nvcc_wrapper")
+add_library(adios2_core_kokkos adiosKokkos.h adiosKokkos.cpp)
+
+set_target_properties(adios2_core_kokkos PROPERTIES
+  VISIBILITY_INLINES_HIDDEN ON
+  INCLUDE_DIRECTORIES "$<BUILD_INTERFACE:${ADIOS2_SOURCE_DIR}/source>;$<BUILD_INTERFACE:${ADIOS2_BINARY_DIR}/source>"
+  EXPORT_NAME core_kokkos
+  OUTPUT_NAME adios2${ADIOS2_LIBRARY_SUFFIX}_core_kokkos
+  )
+
+kokkos_compilation(SOURCE adiosKokkos.cpp)
+
+target_link_libraries(adios2_core_kokkos PRIVATE Kokkos::kokkos)
+