Initial port of common plane to RAJA/Umpire

.gitlab/build_ruby.yml

@@ -9,7 +9,7 @@
 # This is the shared configuration of jobs for ruby
 .on_ruby:
   variables:
-    ALLOC_OPTIONS: "--res=ci --exclusive=user --deadline=now+1hour --mpibind=off"
+    ALLOC_OPTIONS: "--res=ci --exclusive=user --deadline=now+1hour"
     ALLOC_COMMAND: "salloc ${ALLOC_OPTIONS} -N ${ALLOC_NODES} -t ${ALLOC_TIME}"
   tags:
     - shell

.uberenv_config.json

@@ -4,7 +4,7 @@
   "package_final_phase": "initconfig",
   "package_source_dir": "../..",
   "spack_url": "https://github.com/spack/spack.git",
-  "spack_commit": "6d244b3f6776b3697861c6b5cebbee376c30bff3",
+  "spack_commit": "cade66d842a894075938bc5528475d9fcd8bd559",
   "spack_configs_path": "scripts/spack/configs",
   "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"],
   "spack_concretizer": "clingo"

azure-pipelines.yml

@@ -7,7 +7,6 @@ variables:
   Clang_14_ImageName: 'seracllnl/tpls:clang-14_04-16-24_07h-15m'
   GCC_13_ImageName: 'seracllnl/tpls:gcc-13_04-16-24_07h-15m'
   HOME_DIR: '/home/serac'
-  BASE_CMAKE_OPTS: '-UUMPIRE_DIR'
 
 jobs:
 - job: Build_and_Test

cmake/Options.cmake

@@ -4,9 +4,10 @@
 # SPDX-License-Identifier: (MIT)
 
 # Get value for some options from corresponding blt options
-cmake_dependent_option(TRIBOL_ENABLE_CUDA "Enables Tribol with CUDA support" ON "ENABLE_CUDA" OFF)
-cmake_dependent_option(TRIBOL_ENABLE_HIP "Enables Tribol with HIP support" ON "ENABLE_HIP" OFF)
+cmake_dependent_option(TRIBOL_USE_CUDA "Enables Tribol with CUDA support" ON "ENABLE_CUDA" OFF)
+cmake_dependent_option(TRIBOL_USE_HIP "Enables Tribol with HIP support" ON "ENABLE_HIP" OFF)
 cmake_dependent_option(TRIBOL_USE_MPI "Enables MPI in Tribol" ON "ENABLE_MPI" OFF)
+cmake_dependent_option(TRIBOL_USE_OPENMP "Enables Tribol with OpenMP support" ON "ENABLE_OPENMP" OFF)
 cmake_dependent_option(TRIBOL_ENABLE_TESTS "Enables Tribol Tests" ON "ENABLE_TESTS" OFF)
 cmake_dependent_option(TRIBOL_ENABLE_EXAMPLES "Enables Tribol Examples" ON "ENABLE_EXAMPLES" OFF)
 cmake_dependent_option(TRIBOL_ENABLE_DOCS "Enables Tribol Docs" ON "ENABLE_DOCS" OFF)

cmake/SetupThirdParty.cmake

@@ -16,10 +16,10 @@ include(CMakeFindDependencyMacro)
 #------------------------------------------------------------------------------
 # Create global variable to toggle between GPU targets
 #------------------------------------------------------------------------------
-if(TRIBOL_ENABLE_CUDA)
+if(TRIBOL_USE_CUDA)
   set(tribol_device_depends blt::cuda CACHE STRING "" FORCE)
 endif()
-if(TRIBOL_ENABLE_HIP)
+if(TRIBOL_USE_HIP)
   set(tribol_device_depends blt::hip CACHE STRING "" FORCE)
 endif()
 
@@ -40,6 +40,21 @@ else()
 endif()
 
 
+#------------------------------------------------------------------------------
+# RAJA
+#------------------------------------------------------------------------------
+
+if (DEFINED RAJA_DIR)
+  message(STATUS "Setting up external RAJA TPL...")
+
+  find_dependency(raja REQUIRED PATHS "${RAJA_DIR}")
+
+  set(TRIBOL_USE_RAJA TRUE)
+else()
+  message(STATUS "RAJA support is OFF")
+endif()
+
+
 #------------------------------------------------------------------------------
 # axom
 #------------------------------------------------------------------------------
@@ -121,6 +136,7 @@ else()
     message(STATUS "Shroud support is OFF")
 endif()
 
+
 #---------------------------------------------------------------------------
 # Remove non-existant INTERFACE_INCLUDE_DIRECTORIES from imported targets
 # to work around CMake error

cmake/TribolConfig.cmake

@@ -17,6 +17,7 @@ convert_to_native_escaped_file_path(${PROJECT_SOURCE_DIR} TRIBOL_REPO_DIR)
 convert_to_native_escaped_file_path(${CMAKE_BINARY_DIR}   TRIBOL_BIN_DIR)
 
 # Generate and install config header
+set(TRIBOL_DATA_DIR ${PROJECT_SOURCE_DIR}/data)
 tribol_configure_file(${PROJECT_SOURCE_DIR}/src/tribol/config.hpp.in
                       ${PROJECT_BINARY_DIR}/include/tribol/config.hpp)
 

cmake/tribol-config.cmake.in

@@ -28,15 +28,17 @@ if(NOT TRIBOL_FOUND)
   # Language features
   set(TRIBOL_USE_FORTRAN          "@ENABLE_FORTRAN@")
   set(TRIBOL_USE_MPI              "@ENABLE_MPI@")
-  #set(TRIBOL_USE_CUDA            "@TRIBOL_USE_CUDA@")
-  #set(TRIBOL_USE_OPENMP          "@TRIBOL_USE_OPENMP@")
+  set(TRIBOL_USE_CUDA             "@TRIBOL_USE_CUDA@")
+  set(TRIBOL_USE_HIP              "@TRIBOL_USE_HIP@")
+  set(TRIBOL_USE_OPENMP           "@TRIBOL_USE_OPENMP@")
 
   # Config options
   set(TRIBOL_USE_SINGLE_PRECISION "@TRIBOL_USE_SINGLE_PRECISION@")
   set(TRIBOL_USE_64BIT_INDEXTYPE  "@TRIBOL_USE_64BIT_INDEXTYPE@")
 
   # TPLs
   set(TRIBOL_USE_UMPIRE "@TRIBOL_USE_UMPIRE@")
+  set(TRIBOL_USE_RAJA   "@TRIBOL_USE_RAJA@")
 
   #----------------------------------------------------------------------------
   # Bring in required dependencies for this axom configuration
@@ -57,6 +59,15 @@ if(NOT TRIBOL_FOUND)
     find_dependency(umpire REQUIRED PATHS "${UMPIRE_DIR}")
   endif()
 
+  # RAJA is optional
+  if(TRIBOL_USE_RAJA)
+    set(TRIBOL_RAJA_DIR  "@RAJA_DIR@")
+    if(NOT RAJA_DIR) 
+      set(RAJA_DIR "${TRIBOL_RAJA_DIR}")
+    endif()
+    find_dependency(RAJA REQUIRED PATHS "${RAJA_DIR}")
+  endif()
+
   # axom is a required TPL. It is either external, or built-in
   set(TRIBOL_AXOM_DIR  "@AXOM_DIR@")
   if(NOT AXOM_DIR) 

scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml

@@ -200,11 +200,11 @@ spack:
 
     # Globally lock in versions of Devtools
     cmake:
-      version: [3.21.1]
+      version: [3.23.1]
       buildable: false
       externals:
-      - spec: cmake@3.21.1
-        prefix: /usr/tce/packages/cmake/cmake-3.21.1
+      - spec: cmake@3.23.1
+        prefix: /usr/tce/packages/cmake/cmake-3.23.1
     doxygen:
       version: [1.9.6]
       buildable: false
@@ -238,14 +238,14 @@ spack:
 
     # Globally lock version of third party libraries that work on this platform
     axom:
-      variants: ~examples~fortran~lua~tools~openmp
+      variants: ~shared~examples~fortran~lua~tools
     camp:
-      require: "@2024.02.0"
+      require: "@2024.07.0"
     conduit:
-      require: "@0.9.1~shared~test~examples~utilities"
+      require: "@0.9.2~shared~test~examples~utilities"
     hdf5:
       variants: ~shared~mpi
     raja:
-      require: "@2024.02.0~openmp~shared~examples~exercises"
+      require: "@2024.07.0~shared~examples~exercises"
     umpire:
-      require: "@2024.02.0~openmp~shared~examples"
+      require: "@2024.07.0~shared~examples"

scripts/spack/configs/linux_ubuntu_22/spack.yaml

@@ -167,12 +167,12 @@ spack:
 
     # Globally lock version of third party libraries that work on this platform
     axom:
-      require: "@0.9.0.1~examples~fortran~lua~tools~openmp"
+      require: "@0.9.0.2~shared~examples~fortran~lua~tools"
     camp:
-      require: "@2024.02.0"
+      require: "@2024.07.0"
     conduit:
       variants: ~shared~test~examples~utilities
     raja:
-      require: "@2024.02.0~shared~examples~exercises~openmp"
+      require: "@2024.07.0~shared~examples~exercises"
     umpire:
-      require: "@2024.02.0~shared~examples~openmp"
+      require: "@2024.07.0~shared~examples"

scripts/spack/configs/toss_4_x86_64_ib/spack.yaml

@@ -305,9 +305,11 @@ spack:
         prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10
 
     # Globally lock version of third party libraries that work on this platform
+    axom:
+      variants: ~shared~examples~fortran~lua~tools
     conduit:
       variants: ~shared~test~examples~utilities
     raja:
-      require: "@2024.02.0~shared~examples~exercises~openmp"
+      require: "@2024.07.0~shared~examples~exercises"
     umpire:
-      require: "@2024.02.0~shared~examples~openmp"
+      require: "@2024.07.0~shared~examples"