LLNL · ldowen · Jul 25, 2025 · Jul 28, 2025 · Jul 28, 2025 · Jul 29, 2025
diff --git a/.gitmodules b/.gitmodules
@@ -8,11 +8,6 @@
 [submodule "extern/PolyClipper"]
 	path = extern/PolyClipper
 	url = https://github.com/LLNL/PolyClipper
-[submodule "extern/chai"]
-	path = extern/chai
-	url = https://github.com/llnl/chai
-	branch = feature/ManagedSharedPtr
-	ignore = all
 [submodule "extern/ATS"]
 	path = extern/ATS
 	url = https://github.com/LLNL/ATS
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -34,6 +34,13 @@ Notable changes include:
     * Switched the CZ CI to use Dane instead of Ruby.
       * Increased the number of threads for certain memory intensive tests to prevent OOM error.
     * Updated GitHub actions since GitLab mirror changed.
+    * CHAI is no longer a submodule.
+      * CHAI, RAJA, Umpire, and Camp are all brought in through Spack as external TPLs now.
+      * Umpire is updated to version 2025.03.1.
+      * RAJA is updated to version 2025.03.0.
+      * LEOs spack recipe is simplified.
+    * Added spack logic to build TPLs that use CMake as debug when debug is turned on in the spec
+      by adding `build_type=Debug`.
 
 Version v2025.06.1 -- Release date 2025-07-21
 ==============================================

diff --git a/cmake/InstallTPLs.cmake b/cmake/InstallTPLs.cmake
@@ -49,7 +49,7 @@ if (NOT ENABLE_CXXONLY)
     list(APPEND BUILD_REQ_LIST ${SPHERAL_ROOT_DIR}/scripts/docs-requirements.txt)
   endif()
 
-  Spheral_Python_Env(python_build_env 
+  Spheral_Python_Env(python_build_env
     REQUIREMENTS ${BUILD_REQ_LIST}
     PREFIX ${CMAKE_BINARY_DIR}
   )
@@ -74,7 +74,7 @@ if (NOT polyclipper_DIR)
     EXPORT spheral_cxx-targets
     DESTINATION lib/cmake)
   set_target_properties(PolyClipperAPI PROPERTIES EXPORT_NAME spheral::PolyClipperAPI)
-  message("Found PolyClipper External Package")
+  message("Found PolyClipper External Package.")
 else()
   list(APPEND SPHERAL_EXTERN_LIBS polyclipper)
 endif()
@@ -111,7 +111,7 @@ if(adiak_FOUND)
   list(APPEND SPHERAL_BLT_DEPENDS adiak::adiak)
   list(APPEND SPHERAL_FP_TPLS adiak)
   list(APPEND SPHERAL_FP_DIRS ${adiak_DIR})
-  message("Found Adiak External Package")
+  message("Found Adiak External Package.")
 endif()
 
 message("-----------------------------------------------------------------------------")
@@ -132,7 +132,7 @@ if(POLYTOPE_FOUND)
         "${POLYTOPE_INSTALL_PREFIX}/${POLYTOPE_SITE_PACKAGES_PATH}/polytope.so not found")
     endif()
   endif()
-  message("Found Polytope External Package")
+  message("Found Polytope External Package.")
 else()
   list(APPEND SPHERAL_EXTERN_LIBS polytope)
 endif()
@@ -150,45 +150,48 @@ if (SPHERAL_ENABLE_TIMERS)
     list(APPEND SPHERAL_BLT_DEPENDS caliper)
     list(APPEND SPHERAL_FP_TPLS caliper)
     list(APPEND SPHERAL_FP_DIRS ${caliper_DIR})
-    message("Found Caliper External Package")
+    message("Found Caliper External Package.")
   endif()
 endif()
 
+message("-----------------------------------------------------------------------------")
+# HDF5
+find_package(hdf5 REQUIRED NO_DEFAULT_PATH PATHS ${hdf5_DIR})
+if(hdf5_FOUND)
+  message("Found HDF5 External Package.")
+  list(APPEND SPHERAL_BLT_DEPENDS hdf5-shared hdf5_hl-shared)
+  list(APPEND SPHERAL_FP_TPLS hdf5-shared hdf5_hl-shared)
+  list(APPEND SPHERAL_FP_DIRS ${hdf5_DIR})
+  blt_convert_to_system_includes(TARGET hdf5-shared hdf5_hl-shared)
+endif()
+
 message("-----------------------------------------------------------------------------")
 find_package(RAJA REQUIRED NO_DEFAULT_PATH PATHS ${raja_DIR})
-if (RAJA_FOUND) 
+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) 
+if (umpire_FOUND)
   message("Found umpire External Package.")
   blt_convert_to_system_includes(TARGET umpire)
 endif()
 
 message("-----------------------------------------------------------------------------")
 # Chai
-if(chai_DIR AND USE_EXTERNAL_CHAI)
-  find_package(chai REQUIRED NO_DEFAULT_PATH PATHS ${chai_DIR})
-  if (chai_FOUND) 
-    message("Found chai External Package.")
-  endif()
-  list(APPEND SPHERAL_FP_TPLS chai)
-  list(APPEND SPHERAL_FP_DIRS ${chai_DIR})
-else()
-  message("Using chai Submodule.")
-  set(chai_DIR "${SPHERAL_ROOT_DIR}/extern/chai")
-  set(CHAI_ENABLE_TESTS Off)
-  set(CHAI_ENABLE_EXAMPLES Off)
-  set(CHAI_ENABLE_RAJA_PLUGIN On CACHE BOOL "")
-  add_subdirectory(${chai_DIR})
+find_package(chai REQUIRED NO_DEFAULT_PATH PATHS ${chai_DIR})
+if(chai_FOUND)
+  message("Found chai External Package.")
+  blt_convert_to_system_includes(TARGET chai)
 endif()
 
+
+
 list(APPEND SPHERAL_BLT_DEPENDS chai camp RAJA umpire)
-list(APPEND SPHERAL_FP_TPLS RAJA umpire)
-list(APPEND SPHERAL_FP_DIRS ${raja_DIR} ${umpire_DIR})
+list(APPEND SPHERAL_FP_TPLS chai RAJA umpire)
+list(APPEND SPHERAL_FP_DIRS ${chai_DIR} ${raja_DIR} ${umpire_DIR})
 set_property(GLOBAL PROPERTY SPHERAL_FP_TPLS ${SPHERAL_FP_TPLS})
 set_property(GLOBAL PROPERTY SPHERAL_FP_DIRS ${SPHERAL_FP_DIRS})
 
@@ -197,19 +200,19 @@ message("-----------------------------------------------------------------------
 if (ENABLE_SUNDIALS)
   set(SUNDIALS_DIR "${sundials_DIR}")
   find_package(SUNDIALS REQUIRED NO_DEFAULT_PATH
-    COMPONENTS kinsol nvecparallel nvecmpiplusx nvecserial 
+    COMPONENTS kinsol nvecparallel nvecmpiplusx nvecserial
     PATHS ${sundials_DIR}/lib64/cmake/sundials ${sundials_DIR}/lib/cmake/sundials)
   if(SUNDIALS_FOUND)
     list(APPEND SPHERAL_BLT_DEPENDS SUNDIALS::kinsol_static SUNDIALS::nvecparallel_static SUNDIALS::nvecmpiplusx_static SUNDIALS::nvecserial_static)
     list(APPEND SPHERAL_FP_TPLS SUNDIALS::kinsol_static SUNDIALS::nvecparallel_static SUNDIALS::nvecmpiplusx_static SUNDIALS::nvecserial_static)
     list(APPEND SPHERAL_FP_DIRS ${sundials_DIR})
-    message("Found SUNDIALS External Package")
+    message("Found SUNDIALS External Package.")
   endif()
 endif()
 
 message("-----------------------------------------------------------------------------")
 # TPLs that must be imported
-list(APPEND SPHERAL_EXTERN_LIBS boost eigen qhull silo hdf5)
+list(APPEND SPHERAL_EXTERN_LIBS boost eigen qhull silo)
 
 blt_list_append( TO SPHERAL_EXTERN_LIBS ELEMENTS leos IF ENABLE_LEOS)
 blt_list_append( TO SPHERAL_EXTERN_LIBS ELEMENTS aneos IF ENABLE_ANEOS)
@@ -241,4 +244,3 @@ if (NOT ENABLE_CXXONLY)
     DESTINATION ${CMAKE_INSTALL_PREFIX}/.venv/${SPHERAL_SITE_PACKAGES_PATH}/polytope/
   )
 endif()
-
diff --git a/cmake/SpheralMacros.cmake b/cmake/SpheralMacros.cmake
@@ -7,26 +7,26 @@ macro(spheral_add_executable)
     "${options}" "${singleValueArgs}" "${multiValueArgs}" ${ARGN})
 
   if (ENABLE_OPENMP)
-    list (APPEND arg_DEPENDS_ON openmp)
-  endif ()
+    list(APPEND arg_DEPENDS_ON openmp)
+  endif()
 
   if (ENABLE_CUDA)
-    list (APPEND arg_DEPENDS_ON cuda)
-  endif ()
+    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}/tests)
-  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)
+    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}/tests)
+  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(

diff --git a/cmake/spheral/SpheralHandleTPL.cmake b/cmake/spheral/SpheralHandleTPL.cmake
@@ -85,6 +85,8 @@ function(Spheral_Handle_TPL lib_name TPL_CMAKE_DIR)
     TREAT_INCLUDES_AS_SYSTEM ON
     INCLUDES ${${lib_name}_INCLUDE_DIR}
     LIBRARIES ${${lib_name}_LIBRARIES}
+    DEPENDS_ON ${${lib_name}_DEPENDS}
+    LINK_FLAGS ${${lib_name}_LINK_FLAGS}
     EXPORTABLE ON)
   get_target_property(_is_imported ${lib_name} IMPORTED)
   if(NOT ${_is_imported})

diff --git a/cmake/spheral_cxx-config.cmake.in b/cmake/spheral_cxx-config.cmake.in
@@ -10,6 +10,7 @@ if(NOT SPHERAL_FOUND)
   set(SPHERAL_ENABLE_MPI "@ENABLE_MPI@")
   set(SPHERAL_ENABLE_OPENMP "@ENABLE_OPENMP@")
   set(SPHERAL_ENABLE_CUDA "@ENABLE_CUDA@")
+  set(SPHERAL_ENABLE_HIP "@ENABLE_HIP@")
   if(NOT axom_DIR)
     set(axom_DIR "@axom_DIR@" CACHE PATH "")
   endif()
@@ -31,14 +32,6 @@ if(NOT SPHERAL_FOUND)
       find_package(${tpl} REQUIRED QUIET NO_DEFAULT_PATH PATHS ${dir})
     endif()
   endforeach()
-  if(NOT TARGET chai)
-    if (@USE_EXTERNAL_CHAI@)
-      set(SPHERAL_CHAI_DIR "@chai_DIR@/lib/cmake/chai")
-    else()
-      set(SPHERAL_CHAI_DIR "${SPHERAL_CXX_INSTALL_PREFIX}/lib/cmake/chai")
-    endif()
-    find_package(chai REQUIRED QUIET NO_DEFAULT_PATH PATHS ${SPHERAL_CHAI_DIR})
-  endif()
   if(SPHERALC_STANDALONE)
     set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@" CACHE PATH "Spheral C compiler path")
     set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@" CACHE PATH "Spheral C++ compiler path")

diff --git a/cmake/tpl/hdf5.cmake b/cmake/tpl/hdf5.cmake
@@ -1,5 +1,2 @@
 set(${lib_name}_libs libhdf5.so libhdf5_hl.so)
 
-if(ENABLE_STATIC_TPL)
-  string(REPLACE ".so" ".a;" ${lib_name}_libs ${${lib_name}_libs})
-endif()
diff --git a/cmake/tpl/leos.cmake b/cmake/tpl/leos.cmake
@@ -1,6 +1,5 @@
-set(leos_libs libleos_C.a libleos.a liblip-cpp.a libyaml-cpp.a libleospact.a)
-# If we ever support debug TPL builds we'll need the following since the name of the libarary changes
-# if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+set(leos_libs libleos.a liblip-cpp.a libyaml-cpp.a)
+# if(CMAKE_BUILD_TYPE STREQUAL "Debug")
 #   list(APPEND leos_libs libyaml-cppd.a)
 # else()
 #   list(APPEND leos_libs libyaml-cpp.a)

diff --git a/extern/chai b/extern/chai
diff --git a/scripts/spack/packages/camp/package.py b/scripts/spack/packages/camp/package.py
@@ -0,0 +1,13 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+from spack.package import *
+from spack.pkg.builtin.camp import Camp as BuiltinCamp
+
+
+class Camp(BuiltinCamp):
+
+    version("2025.03.0", tag="v2025.03.0", submodules=False)
diff --git a/scripts/spack/packages/chai/package.py b/scripts/spack/packages/chai/package.py
@@ -0,0 +1,15 @@
+# Copyright 2013-2024 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+
+from spack.package import *
+from spack.pkg.builtin.chai import Chai as BuiltinChai
+
+
+class Chai(BuiltinChai):
+
+    version("develop", commit="b7babdc0c333baa68e53b026c63d65c48c8d8eb1", submodules=False)
+    depends_on("raja@2025.03.0", type="build", when="+raja")
+    depends_on("umpire@2025.03.1", type="build")