Value-View Interface

.gitlab/machines.yml

@@ -8,7 +8,7 @@
   variables:
     HOSTNAME: 'ruby'
     PARTITION: pdebug
-    BUILD_ALLOC: srun -N 1 -c 36 -p pdebug -t 60
+    BUILD_ALLOC: salloc -N 1 -p pdebug -t 60 --exclusive
     TEST_ALLOC: ''
     CLEAN_ALLOC: srun -n 20
   extends: [.on_toss_4_x86]

.gitlab/scripts.yml

@@ -27,11 +27,7 @@
   script:
     - CI_BUILD_DIR=$(cat ci-dir.txt)
     - cd $CI_BUILD_DIR && cat job-name.txt
-    - $BUILD_ALLOC ./$SCRIPT_DIR/devtools/host-config-build.py --host-config gitlab.cmake --build $EXTRA_CMAKE_ARGS
-  artifacts:
-    paths:
-      - ci-dir.txt
-      - job-name.txt
+    - $BUILD_ALLOC ./$SCRIPT_DIR/devtools/host-config-build.py --host-config gitlab.cmake --build --test $EXTRA_CMAKE_ARGS
 
 .build_and_test:
   extends: [.build]

.gitlab/specs.yml

@@ -36,7 +36,7 @@
 .cuda_11_gcc_spectrum:
   variables:
     SPEC: 'gcc@$GCC_VERSION+cuda cuda_arch=70'
-    EXTRA_CMAKE_ARGS: '-DENABLE_TIMER=On'
+    EXTRA_CMAKE_ARGS: '-DENABLE_TIMER=On -DSPHERAL_ENABLE_VVI=On'
 
 .oneapi_2022_1_mvapich2:
   variables:

cmake/CMakeDefinitions.cmake

@@ -16,6 +16,15 @@ else()
   add_definitions("-DDEBUG=0")
 endif()
 
+if (SPHERAL_ENABLE_VVI)
+  message("-- Value-View Interface Pattern (VVI) : Enabled")
+  message("------ WARNING ------")
+  message("-- VVI is an experimental implementation necessary for the GPU port. Use with caution!")
+  message("---------------------")
+else()
+  message("-- Semantic Class Interface Pattern (VVI) : Disabled")
+endif()
+
 # The DBC flag
 if (DBC_MODE STREQUAL "All")
   message("-- DBC (design by contract) set to All")

cmake/InstallTPLs.cmake

@@ -86,11 +86,13 @@ message("-----------------------------------------------------------------------
 find_package(RAJA REQUIRED NO_DEFAULT_PATH PATHS ${raja_DIR})
 if (RAJA_FOUND) 
   message("Found RAJA External Package.")
+  blt_convert_to_system_includes(TARGET RAJA)
 endif()
 message("-----------------------------------------------------------------------------")
 find_package(umpire REQUIRED NO_DEFAULT_PATH PATHS ${umpire_DIR})
 if (umpire_FOUND) 
   message("Found umpire External Package.")
+  blt_convert_to_system_includes(TARGET umpire)
 endif()
 message("-----------------------------------------------------------------------------")
 

cmake/SetupSpheral.cmake

@@ -11,6 +11,11 @@ if (NOT SPHERAL_CMAKE_MODULE_PATH)
 endif()
 list(APPEND CMAKE_MODULE_PATH "${SPHERAL_CMAKE_MODULE_PATH}")
 
+#-------------------------------------------------------------------------------
+# Add Spheral CMake Macros for tests and executables
+#-------------------------------------------------------------------------------
+include(SpheralMacros)
+
 #-------------------------------------------------------------------------------
 # Set Compiler Flags / Options
 #-------------------------------------------------------------------------------
@@ -85,7 +90,10 @@ if(ENABLE_CUDA)
   #set(CMAKE_CUDA_FLAGS  "${CMAKE_CUDA_FLAGS} -arch=${CUDA_ARCH} --expt-relaxed-constexpr --extended-lambda -Xcudafe --display_error_number")
   set(CMAKE_CUDA_STANDARD 17)
   list(APPEND SPHERAL_CXX_DEPENDS cuda)
+  set(SPHERAL_ENABLE_CUDA On)
+  set(SPHERAL_ENABLE_VVI On)
 endif()
+message("Enable Value-View Interface Pattern (VVI) : ${SPHERAL_ENABLE_VVI}")
 
 #-------------------------------------------------------------------------------#
 # Set a default build type if none was specified
@@ -140,6 +148,10 @@ set_property(GLOBAL PROPERTY SPHERAL_CXX_DEPENDS "${SPHERAL_CXX_DEPENDS}")
 #-------------------------------------------------------------------------------
 # Prepare to build the src
 #-------------------------------------------------------------------------------
+configure_file(${SPHERAL_ROOT_DIR}/src/config.hh.in
+  ${PROJECT_BINARY_DIR}/src/config.hh)
+include_directories(${PROJECT_BINARY_DIR}/src)
+
 add_subdirectory(${SPHERAL_ROOT_DIR}/src)
 
 #-------------------------------------------------------------------------------
@@ -153,6 +165,7 @@ endif()
 # Build C++ tests and install tests to install directory
 #-------------------------------------------------------------------------------
 if (ENABLE_TESTS)
+  add_subdirectory(${SPHERAL_ROOT_DIR}/tests)
   add_subdirectory(${SPHERAL_ROOT_DIR}/tests/unit/CXXTests)
 
   # A macro to preserve directory structure when installing files

cmake/SpheralMacros.cmake

@@ -0,0 +1,87 @@
+macro(spheral_add_executable)
+  set(options )
+  set(singleValueArgs NAME TEST REPRODUCER BENCHMARK)
+  set(multiValueArgs SOURCES DEPENDS_ON)
+
+  cmake_parse_arguments(arg
+    "${options}" "${singleValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  if (ENABLE_OPENMP)
+    list (APPEND arg_DEPENDS_ON openmp)
+  endif ()
+
+  if (ENABLE_CUDA)
+    list (APPEND arg_DEPENDS_ON cuda)
+  endif ()
+
+  if (ENABLE_HIP)
+    list (APPEND arg_DEPENDS_ON blt::hip)
+    list (APPEND arg_DEPENDS_ON blt::hip_runtime)
+  endif ()
+
+  if (${arg_TEST})
+    set (_output_dir ${CMAKE_BINARY_DIR}/test)
+  elseif (${arg_REPRODUCER})
+    set (_output_dir ${CMAKE_BINARY_DIR}/reproducers)
+  elseif (${arg_BENCHMARK})
+    set (_output_dir ${CMAKE_BINARY_DIR}/benchmark)
+  else ()
+    set (_output_dir ${CMAKE_BINARY_DIR}/bin)
+  endif()
+
+  blt_add_executable(
+    NAME ${arg_NAME}
+    SOURCES ${arg_SOURCES}
+    DEPENDS_ON ${arg_DEPENDS_ON}
+    OUTPUT_DIR ${_output_dir}
+    )
+
+  target_include_directories(${arg_NAME} SYSTEM PRIVATE ${SPHERAL_EXTERN_INCLUDES})
+  target_include_directories(${arg_NAME} SYSTEM PRIVATE ${SPHERAL_ROOT_DIR}/src)
+  target_include_directories(${arg_NAME} SYSTEM PRIVATE ${PROJECT_BINARY_DIR}/src)
+
+endmacro(spheral_add_executable)
+
+macro(spheral_add_test)
+  set(options DEBUG_LINKER)
+  set(singleValueArgs NAME)
+  set(multiValueArgs SOURCES DEPENDS_ON)
+
+  cmake_parse_arguments(arg
+    "${options}" "${singleValueArgs}" "${multiValueArgs}" ${ARGN})
+
+  set(original_test_name ${arg_NAME})
+  set(original_src ${arg_SOURCES})
+  set(original_deps ${arg_DEPENDS_ON})
+
+  get_property(SPHERAL_BLT_DEPENDS GLOBAL PROPERTY SPHERAL_BLT_DEPENDS)
+
+  blt_add_library(
+    NAME ${original_test_name}_lib
+    SOURCES ${TEST_LIB_SOURCE}
+    SOURCES ${SPHERAL_ROOT_DIR}/src/spheralCXX.cc
+    DEPENDS_ON ${SPHERAL_BLT_DEPENDS} ${original_deps}
+    SHARED False 
+    )
+
+  target_link_options(${original_test_name}_lib PRIVATE "-Wl,--unresolved-symbols=ignore-in-object-files")
+
+  spheral_add_executable(
+    NAME ${original_test_name}.exe
+    SOURCES ${original_src}
+    DEPENDS_ON gtest ${CMAKE_THREAD_LIBS_INIT} ${original_test_name}_lib
+    TEST On)
+
+  blt_add_test(
+    NAME ${original_test_name}
+    COMMAND ${TEST_DRIVER} ${original_test_name}.exe)
+
+  target_include_directories(${original_test_name}.exe SYSTEM PRIVATE ${SPHERAL_ROOT_DIR}/tests/cpp/include)
+
+  if (${arg_DEBUG_LINKER})
+    target_link_options(${original_test_name}.exe PUBLIC "-Wl,--warn-unresolved-symbols")
+  else()
+    target_link_options(${original_test_name}.exe PUBLIC "-Wl,--unresolved-symbols=ignore-all")
+  endif()
+
+endmacro(spheral_add_test)

cmake/spheral/SpheralAddLibs.cmake

@@ -116,7 +116,7 @@ function(spheral_add_cxx_library package_name _cxx_obj_list)
   #  set_target_properties(Spheral_${package_name} PROPERTIES ${_prop} "${temp_prop}")
   #endforeach()
 
-  #set_target_properties(Spheral_${package_name} PROPERTIES INTERFACE_LINK_LIBRARIES "")
+  set_target_properties(Spheral_${package_name} PROPERTIES INTERFACE_LINK_LIBRARIES "")
 
   # Convert package name to lower-case for export target name
   string(TOLOWER ${package_name} lower_case_package)

docs/build_guide/include/appendecies/cmake_config.rst.inc

@@ -86,6 +86,9 @@ In this section we list the CMake variables that can be tweaked for a Spheral bu
 ``ENABLE_DEV_BUILD`` (On, *Off*)
   Builds separate internal C++ libraries for faster code development.
 
+``SPHERAL_ENABLE_VVI`` (On, *Off*)
+  Builds Spheral with the experimental Value-View Interface for GPU porting capabilities.
+
 ``<TPL-Name-Here>_DIR``
   Directory of previously built TPL.