Merge branch 'develop' into feature/RZhydro

jmikeowen · jmikeowen · commit 3db04c8eb3d1 · 2026-05-05T10:29:10.000-07:00
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -5,6 +5,7 @@ Version vYYYY.MM.p -- Release date YYYY-MM-DD
 Notable changes include:
 
   * New features / API changes:
+    * Now require C++20.
     * Added view class for PairwiseField (PairwiseFieldView)
     * Refactored use of pair-wise fields in hydro packages to avoid using pointers and allow empty PairwiseFields
     * ArtificialViscosity has been refactored for use on the GPU.
@@ -22,6 +23,7 @@ Notable changes include:
     * Bin files in install (bin/spheral and bin/spheral-ats) now use relative paths instead of being configured for one specific path.
     * Added a page to the docs about GPU development. 
     * Optimized field lookups in state, reducing per-call cost from O(N) to O(log N)
+    * Added the more aptly named SPHERAL_EXTERNAL_INSTALL in places where ENABLE_STATIC_TPLS was being used.
 
   * Bug fixes:
     * Adiak memory leak is fixed by calling adiak::clean() before exit.
@@ -33,8 +35,9 @@ Notable changes include:
       For users importing from the master Spheral.py file (or it's dimensional specialization) this change is hidden,
       so there is no user interface impact.
     * Fixed bug with incorrect optimizations when for Debug builds with hip enabled.
-    * Updated from Rocm 6.2.0 to 6.4.3.
+    * Updated from ROCM 6.2.0 to 6.4.3.
     * Added update-tpls commit message trigger.
+    * Updated LC Clang from 14.0.6 to 19.1.3 to use C++20.
     * Spheral mpi python interface ensures proper allocation calls are used on Flux machines to avoid strange hangs that can occur if running outside of allocations.
     * tpl-manager.py updates:
       * Added --no-upstream option for when on LC machines but cannot access upstream.
diff --git a/cmake/Compilers.cmake b/cmake/Compilers.cmake
@@ -29,6 +29,8 @@ if (ENABLE_WARNINGS)
       list(APPEND CXX_COMPILE_FLAGS -Wno-deprecated-declarations -Wno-gnu-zero-variadic-macro-arguments)
       if(CMAKE_CXX_COMPILER_VERSION LESS 20.0.0)
         list(APPEND CXX_COMPILE_FLAGS -Wno-enum-constexpr-conversion)
+      endif()
+      if(CMAKE_CXX_COMPILER_VERSION LESS 19.0.0)
         # We build some Fortran code from outside sources (like the Helmholtz EOS) that
         # cause building errors if the compiler is too picky...
         set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wno-missing-include-dirs")
diff --git a/cmake/InstallTPLs.cmake b/cmake/InstallTPLs.cmake
@@ -160,24 +160,13 @@ endif()
 
 message("-----------------------------------------------------------------------------")
 # HDF5
-# This is a hack to allow other codes to use old versions of hdf5
-# Ideally, if(NOT ENABLE_STATIC_TPL) would be replaced and the
-# find_package call would be moved outside of the if statement:
-#
-# find_package(hdf5 NO_DEFAULT_PATH PATHS ${hdf5_DIR})
-# if (hdf5_FOUND)
 
-
-if(NOT ENABLE_STATIC_TPL)
+if(NOT SPHERAL_EXTERNAL_INSTALL)
   find_package(hdf5 REQUIRED NO_DEFAULT_PATH PATHS ${hdf5_DIR})
   message("Found HDF5 External Package.")
   list(APPEND SPHERAL_FP_TPLS hdf5)
   list(APPEND SPHERAL_FP_DIRS ${hdf5_DIR})
-  if(ENABLE_STATIC_TPL)
-    list(APPEND SPHERAL_BLT_DEPENDS hdf5-static hdf5_hl-static)
-  else()
-    list(APPEND SPHERAL_BLT_DEPENDS hdf5-shared hdf5_hl-shared)
-  endif()
+  list(APPEND SPHERAL_BLT_DEPENDS hdf5-shared hdf5_hl-shared)
 else()
   list(APPEND SPHERAL_EXTERN_LIBS hdf5)
 endif()
@@ -224,14 +213,14 @@ if (SPHERAL_ENABLE_SUNDIALS)
 endif()
 
 message("-----------------------------------------------------------------------------")
-# This is a hack to allow other codes to use an unconvential Boost install
-if(NOT ENABLE_STATIC_TPL)
+if(NOT SPHERAL_EXTERNAL_INSTALL)
   find_package(Boost REQUIRED NO_DEFAULT_PATH COMPONENTS filesystem PATHS ${boost_DIR})
   if(Boost_FOUND)
     list(APPEND SPHERAL_BLT_DEPENDS Boost::filesystem)
     message("Found Boost External Package version ${Boost_VERSION}")
   endif()
 else()
+  # This is used in case a code wants to use an unconventional Boost install
   list(APPEND SPHERAL_EXTERN_LIBS boost)
 endif()
 
diff --git a/cmake/SetupSpheral.cmake b/cmake/SetupSpheral.cmake
@@ -3,7 +3,7 @@ include(ExternalProject)
 #-------------------------------------------------------------------------------
 # Configure CMake
 #-------------------------------------------------------------------------------
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 set(CMAKE_EXPORT_COMPILE_COMMANDS On)
 
@@ -39,7 +39,7 @@ set(Python3_EXECUTABLE ${python_DIR}/bin/python3)
 set(ENABLE_MPI ON CACHE BOOL "")
 set(ENABLE_OPENMP ON CACHE BOOL "")
 
-set(BLT_CXX_STD "c++17" CACHE STRING "")
+set(BLT_CXX_STD "c++20" CACHE STRING "")
 set(BLT_DOCS_TARGET_NAME "blt_docs" CACHE STRING "")
 
 if(NOT SPHERAL_BLT_DIR)
diff --git a/cmake/SpheralOptions.cmake b/cmake/SpheralOptions.cmake
@@ -57,9 +57,10 @@ endif()
 cmake_dependent_option(SPHERAL_ENABLE_DOCS "Enable sphinx Spheral documentation" OFF SPHERAL_ENABLE_PYTHON OFF)
 
 #-------------------------------------------------------------------------------
-# For using static TPLs
+# External install
 #-------------------------------------------------------------------------------
-option(ENABLE_STATIC_TPL "Assume TPLs are built statically" OFF)
+option(SPHERAL_EXTERNAL_INSTALL "Enable when Spheral is a TPL" OFF)
+option(ENABLE_STATIC_TPL "Build Spheral TPLs as static libraries" OFF)
 
 #-------------------------------------------------------------------------------
 # Debug options
diff --git a/cmake/spheral/SpheralHandleExt.cmake b/cmake/spheral/SpheralHandleExt.cmake
@@ -7,24 +7,33 @@
 # INPUT VARIABLES
 # ----------------------
 # <lib_name>      : REQUIRED : name of target TPL
-# APPLE           : REQUIRED : flag for Mac OSX
 
 # ----------------------
 # OUTPUT VARIABLES
 # ----------------------
 # <lib_name>_libs : list of library names with modified extension
 #----------------------------------------------------------------------------------------
 
-function(Spheral_Handle_Ext lib_name APPLE)
-
+function(Spheral_Handle_Ext lib_name)
   if(APPLE)
-    set(SHARED_EXT "dylib")
+    set(_lib_ext ".dylib")
+  elseif(ENABLE_STATIC_TPL)
+    set(_lib_ext ".a")
   else()
-    set(SHARED_EXT "so")
-  endif()
-
-  if(ENABLE_STATIC_TPL)
-    string(REPLACE ".${SHARED_EXT}" ".a;" ${lib_name}_libs ${${lib_name}_libs})
+    list(GET ${lib_name}_libs 0 _test_lib)
+    set(_full_test_lib "${${lib_name}_DIR}/**/${_test_lib}")
+    file(GLOB FOUND_DYLIB "${_full_test_lib}.dylib")
+    file(GLOB FOUND_STATIC "${_full_test_lib}.a")
+    if(FOUND_DYLIB)
+      set(_lib_ext ".dylib")
+    elseif(FOUND_STATIC)
+      set(_lib_ext ".a")
+    else()
+      set(_lib_ext ".so")
+    endif()
   endif()
 
+  list(TRANSFORM ${lib_name}_libs APPEND ${_lib_ext})
+  set(${lib_name}_libs "${${lib_name}_libs}" PARENT_SCOPE)
+  message("${${lib_name}_libs}")
 endfunction()
diff --git a/cmake/spheral_cxx-config.cmake.in b/cmake/spheral_cxx-config.cmake.in
@@ -13,7 +13,7 @@ if(NOT SPHERAL_FOUND)
   set(SPHERAL_ENABLE_HIP @ENABLE_HIP@)
   set(SPHERAL_ENABLE_TIMERS @SPHERAL_ENABLE_TIMERS@)
   set(SPHERAL_ENABLE_PYTHON @SPHERAL_ENABLE_PYTHON@)
-  set(ENABLE_STATIC_TPL @ENABLE_STATIC_TPL@)
+  set(SPHERAL_EXTERNAL_INSTALL @SPHERAL_EXTERNAL_INSTALL@)
   if(NOT axom_DIR)
     set(axom_DIR "@axom_DIR@" CACHE PATH "")
   endif()
@@ -30,7 +30,7 @@ if(NOT SPHERAL_FOUND)
     find_package(Python3 COMPONENTS Interpreter Development)
     set(PYTHON_EXE ${Python3_EXECUTABLE})
   endif()
-  if(NOT ENABLE_STATIC_TPL)
+  if(NOT SPHERAL_EXTERNAL_INSTALL)
     find_package(Boost REQUIRED QUIET NO_DEFAULT_PATH COMPONENTS filesystem PATHS ${Boost_DIR})
   endif()
   # Loop over TPLs that use find_package
diff --git a/cmake/tpl/hdf5.cmake b/cmake/tpl/hdf5.cmake
@@ -1,5 +1,3 @@
-set(${lib_name}_libs libhdf5.dylib libhdf5_hl.dylib)
+set(${lib_name}_libs libhdf5 libhdf5_hl)
 
-if(ENABLE_STATIC_TPL)
-  string(REPLACE ".dylib" ".a;" ${lib_name}_libs ${${lib_name}_libs})
-endif()
+Spheral_Handle_Ext(${lib_name})
diff --git a/cmake/tpl/polytope.cmake b/cmake/tpl/polytope.cmake
@@ -1,6 +1,3 @@
-set(${lib_name}_libs libpolytope.a)
+set(${lib_name}_libs libpolytope)
 
-if(APPLE)
-  set(${lib_name}_libs libpolytope.dylib)
-endif()
-Spheral_Handle_Ext(${lib_name} APPLE)
+Spheral_Handle_Ext(${lib_name})
diff --git a/cmake/tpl/silo.cmake b/cmake/tpl/silo.cmake
@@ -1,6 +1,3 @@
-set(${lib_name}_libs libsiloh5.a)
+set(${lib_name}_libs "libsiloh5")
 
-if(APPLE)
-  set(${lib_name}_libs libsiloh5.dylib)
-endif()
-Spheral_Handle_Ext(${lib_name} APPLE)
+Spheral_Handle_Ext(${lib_name})
diff --git a/docs/build_guide/appendix/cmake_config.rst b/docs/build_guide/appendix/cmake_config.rst
@@ -86,6 +86,10 @@ The following are CMake variables that can be set during configure time. In gene
 
    Default location Spheral will search for cached pip packages.
 
+.. option:: -DSPHERAL_EXTERNAL_INSTALL=<OFF, ON>
+
+   Enable when Spheral is being built as a TPL for a separate project.
+
 .. option:: -DSPHERAL_DBC_MODE=<None, All, Pre>
 
    Set the compile time design by contract (DBC) mode for Spheral. Design by contract statements are very useful developer tools, whereby the developer can insert tests in the code as they write it.
@@ -110,11 +114,11 @@ Compiler Options
 
 Options specific to compilers:
 
-.. option:: -DSPHERAL_ENABLE_WARNINGS=<ON, OFF>
+.. option:: -DENABLE_WARNINGS=<ON, OFF>
 
    Show compiler warnings.
 
-.. option:: -DSPHERAL_ENABLE_WARNINGS_AS_ERRORS=<OFF, ON>
+.. option:: -DENABLE_WARNINGS_AS_ERRORS=<OFF, ON>
 
    Return an error during compilation if warning occurs.
 
diff --git a/scripts/spack/configs/toss_4_x86_64_ib/packages.yaml b/scripts/spack/configs/toss_4_x86_64_ib/packages.yaml
@@ -25,13 +25,13 @@ packages:
         extra_rpaths: []
   llvm:
     externals:
-    - spec: llvm@14.0.6+clang+flang~lld~lldb
-      prefix: /usr/tce/packages/clang/clang-14.0.6
+    - spec: llvm@19.1.3+clang+flang~lld~lldb
+      prefix: /usr/tce/packages/clang/clang-19.1.3-magic
       extra_attributes:
         compilers:
-          c: /usr/tce/packages/clang/clang-14.0.6/bin/clang
-          cxx: /usr/tce/packages/clang/clang-14.0.6/bin/clang++
-          fortran: /usr/tce/packages/clang/clang-14.0.6-magic/bin/flang
+          c: /usr/tce/packages/clang/clang-19.1.3-magic/bin/clang
+          cxx: /usr/tce/packages/clang/clang-19.1.3-magic/bin/clang++
+          fortran: /usr/tce/packages/clang/clang-19.1.3-magic/bin/flang
         flags: {}
         environment: {}
         extra_rpaths: []
@@ -62,10 +62,10 @@ packages:
 
   mvapich2:
     externals:
-    - spec: mvapich2@2.3.6~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 file_systems=lustre,nfs,ufs process_managers=slurm %gcc@10.3.1
+    - spec: mvapich2@2.3.6.gcc process_managers=slurm %gcc@10.3.1
       prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1-magic
-    - spec: mvapich2@2.3.6~alloca~cuda~debug+regcache+wrapperrpath ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm %clang@14.0.6
-      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6-magic
+    - spec: mvapich2@2.3.7.llvm process_managers=slurm %clang@19.1.3
+      prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-19.1.3
     buildable: false
 
 # ------ SYSTEM LIBS -------
diff --git a/src/DataOutput/RestartRegistrar.cc b/src/DataOutput/RestartRegistrar.cc
@@ -129,16 +129,20 @@ RestartRegistrar::
 uniqueLabels() {
   this->removeExpiredPointers();
   vector<string> result;
-  unsigned counter = 0;
   for (const_iterator itr = this->begin();
        itr != this->end();
        ++itr) {
     string l = itr->lock()->label();
     if (find(result.begin(), result.end(), l) != result.end()) {
-      std::stringstream newlabel;
-      newlabel << l << "_" << counter;
-      l = newlabel.str();
-      ++counter;
+      unsigned counter = 0;
+      string candidate;
+      do {
+        std::stringstream newlabel;
+        newlabel << l << "_" << counter;
+        candidate = newlabel.str();
+        ++counter;
+      } while (find(result.begin(), result.end(), candidate) != result.end());
+      l = candidate;
     }
     CHECK(find(result.begin(), result.end(), l) == result.end());
     result.push_back(l);
diff --git a/src/FileIO/SiloFileIO.cc b/src/FileIO/SiloFileIO.cc
@@ -218,7 +218,7 @@ SiloFileIO::write(const size_t& value, const string path) {
   const string varname = setdir(mFilePtr, path);
   int dims[1] = {1};
   CONTRACT_VAR(dims);
-  VERIFY2(DBWrite(mFilePtr, varname.c_str(), &value, dims, 1, DB_INT) == 0,
+  VERIFY2(DBWrite(mFilePtr, varname.c_str(), &value, dims, 1, DB_LONG) == 0,
           "SiloFileIO ERROR: unable to write variable " << path);
 }
 
