Update Tribol TPLs

.gitignore

@@ -1,8 +1,10 @@
 
-/build*/
-/install*/
-/uberenv_libs*
-/spack*
+/build-*/
+/install-*/
 /*.cmake
-.vscode/
 __pycache__/
+/.cache/
+/.vscode/
+/build-*-*-*-*
+/compile_commands.json
+.DS_Store

.uberenv_config.json

@@ -4,9 +4,8 @@
   "package_final_phase": "initconfig",
   "package_source_dir": "../..",
   "spack_url": "/~https://github.com/spack/spack.git",
-  "spack_commit": "cade66d842a894075938bc5528475d9fcd8bd559",
+  "spack_commit": "9d1332f1a11923e1b0b1fbc08984a84183e94633",
   "spack_configs_path": "scripts/spack/configs",
-  "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"],
-  "spack_concretizer": "clingo"
+  "spack_packages_path": ["scripts/spack/radiuss-spack-configs/packages", "scripts/spack/packages"]
   }
 

scripts/spack/configs/blueos_3_ppc64le_ib_p9/spack.yaml

@@ -206,43 +206,45 @@ spack:
       - spec: cmake@3.23.1
         prefix: /usr/tce/packages/cmake/cmake-3.23.1
     doxygen:
-      version: [1.9.6]
-      buildable: false
+      version: [1.9.8]
       externals:
-      - spec: doxygen@1.9.6
-        prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.6
-    llvm:
-      version: [10.0.0]
+        - spec: doxygen@1.9.8
+          prefix: /usr/workspace/smithdev/devtools/blueos_3_ppc64le_ib_p9/latest/doxygen-1.9.8
       buildable: false
-      externals:
-      - spec: llvm@10.0.0+clang
-        prefix: /usr/tce/packages/clang/clang-10.0.0
-    python:
-      version: [3.10.10]
+    llvm:
+      version: [14.0.5]
       buildable: false
       externals:
-      - spec: python@3.10.10
-        prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10
+      - spec: llvm@14.0.5+clang+python
+        prefix: /usr/tce/packages/clang/clang-14.0.5
     py-shroud:
       version: [0.12.2]
       buildable: false
       externals:
       - spec: py-shroud@0.12.2
         prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10
     py-sphinx:
-      version: [6.1.3]
+      version: [7.2.6]
+      externals:
+        - spec: py-sphinx@7.2.6
+          prefix: /usr/workspace/smithdev/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.11.7
       buildable: false
+    python:
+      version: [3.8.2]
       externals:
-      - spec: py-sphinx@6.1.3
-        prefix: /collab/usr/gapps/axom/devtools/blueos_3_ppc64le_ib_p9/latest/python-3.10.10
+        - spec: python@3.8.2~dbm
+          prefix: /usr/tce/packages/python/python-3.8.2/
+      buildable: false
 
     # Globally lock version of third party libraries that work on this platform
     axom:
-      variants: ~shared~examples~fortran~lua~tools
+      require: "@0.10.1.2~shared~examples~fortran~lua~tools"
     camp:
       require: "@2024.07.0"
     conduit:
       require: "@0.9.2~shared~test~examples~utilities"
+    fmt:
+      require: "@9.1"
     hdf5:
       variants: ~shared~mpi
     raja:

scripts/spack/configs/linux_ubuntu_22/spack.yaml

@@ -167,7 +167,7 @@ spack:
 
     # Globally lock version of third party libraries that work on this platform
     axom:
-      require: "@0.9.0.2~shared~examples~fortran~lua~tools"
+      require: "@0.10.1.2~shared~examples~fortran~lua~tools"
     camp:
       require: "@2024.07.0"
     conduit:

scripts/spack/configs/toss_4_x86_64_ib/spack.yaml

@@ -274,41 +274,42 @@ spack:
       - spec: cmake@3.23.1
         prefix: /usr/tce
     doxygen:
-      version: [1.9.6]
+      version: [1.9.8]
       buildable: false
       externals:
-      - spec: doxygen@1.9.6
-        prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.6
-    # TODO: make installed clang 14.0.6 work
+      - spec: doxygen@1.9.8
+        prefix: /usr/workspace/smithdev/devtools/toss_4_x86_64_ib/latest/doxygen-1.9.8
     llvm:
-      version: [10.0.0]
+      version: [14.0.6]
       buildable: false
       externals:
-      - spec: llvm+clang@10.0.0
-        prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/llvm-10.0.0
+      - spec: llvm@14.0.6
+        prefix: /usr/tce/packages/clang/clang-14.0.6
     py-shroud:
       version: [0.12.2]
       buildable: false
       externals:
       - spec: py-shroud@0.12.2
         prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10
     py-sphinx:
-      version: [7.0.0]
+      version: [7.2.6]
       buildable: false
       externals:
-      - spec: py-sphinx@7.0.0
-        prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10
+      - spec: py-sphinx@7.2.6
+        prefix: /usr/workspace/smithdev/devtools/toss_4_x86_64_ib/latest/python-3.11.7
     python:
       buildable: false
       externals:
-      - spec: python@3.10.10
-        prefix: /collab/usr/gapps/axom/devtools/toss_4_x86_64_ib/latest/python-3.10.10
+      - spec: python@3.9.12
+        prefix: /usr/tce/packages/python/python-3.9.12
 
     # Globally lock version of third party libraries that work on this platform
     axom:
-      variants: ~shared~examples~fortran~lua~tools
+      require: "@0.10.1.2~shared~examples~fortran~lua~tools"
+    camp:
+      require: "@2024.07.0"
     conduit:
-      variants: ~shared~test~examples~utilities
+      variants: "@0.9.2~shared~test~examples~utilities"
     raja:
       require: "@2024.07.0~shared~examples~exercises"
     umpire:

scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml

@@ -230,6 +230,15 @@ spack:
       - spec: rocblas@6.2.1
         prefix: /opt/rocm-6.2.1
 
+    hipblas:
+      version: [6.1.2, 6.2.1]
+      buildable: false
+      externals:
+      - spec: hipblas@6.1.2%rocmcc@6.1.2
+        prefix: /opt/rocm-6.1.2
+      - spec: hipblas@6.2.1%rocmcc@6.2.1
+        prefix: /opt/rocm-6.2.1
+
     rocminfo:
       version: [5.2.3, 5.4.3, 5.6.0, 5.7.1, 6.1.2, 6.2.1]
       buildable: false
@@ -470,11 +479,13 @@ spack:
 
     # Globally lock version of third party libraries that work on this platform
     axom:
-      variants: ~shared~examples~fortran~lua~tools
+      variants: "@0.10.1.2~shared~examples~fortran~lua~tools"
     camp:
       require: "@2024.07.0"
     conduit:
       require: "@0.9.2~shared~test~examples~utilities"
+    mfem:
+      require: "@4.7.0.2"
     raja:
       require: "@2024.07.0~shared~examples~exercises"
     umpire:

scripts/spack/packages/axom/package.py

@@ -1,19 +1,20 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
+# Copyright (c) 2019-2025, Lawrence Livermore National Security, LLC and
+# other Tribol Project Developers. See the top-level COPYRIGHT file for details.
 #
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+# SPDX-License-Identifier: (MIT)
 
 import os
 from os.path import join as pjoin
 
+from spack.package import *
 from spack.pkg.builtin.axom import Axom as BuiltinAxom
 from spack.util.executable import which_string
 
 class Axom(BuiltinAxom):
 
     # Note: We add a number to the end of the real version number to indicate that we have
     #  moved forward past the release. Increment the last number when updating the commit sha.
-    version("0.9.0.2", commit="270953a4f67b5b4ec897f6d2bbf61024cfef70b9", submodules=False)
+    version("0.10.1.2", commit="21d9bc8a03431204ce6d2848c11fd96ef3fe7dd8", submodules=False)
 
     # bring over latest from axom recipe (delete when we update spack)
     def initconfig_hardware_entries(self):

scripts/spack/packages/cray-mpich/package.py

@@ -1,11 +1,11 @@
-# Copyright 2013-2023 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
+# Copyright (c) 2019-2025, Lawrence Livermore National Security, LLC and
+# other Tribol Project Developers. See the top-level COPYRIGHT file for details.
 #
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+# SPDX-License-Identifier: (MIT)
 
 import os
 
-from spack import *
+from spack.package import *
 from spack.util.module_cmd import get_path_args_from_module_line, module
 
 

scripts/spack/packages/mfem/mfem-4.7-sundials-7.patch

@@ -0,0 +1,11 @@
+diff --git a/CHANGELOG b/CHANGELOG
+index cc064859e0..5adf5d8639 100644
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,3 +1,6 @@
++# This dummy patch is to prevent the real patch in MFEM's builtin Spack package from being applied.
++# All changes in mfem-4.7-sundials-7.patch are already in MFEM since 4.7.0.2.
++# Original patch: /~https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/mfem/mfem-4.7-sundials-7.patch
+                     Finite Element Discretization Library
+                                    __
+                        _ __ ___   / _|  ___  _ __ ___

scripts/spack/packages/mfem/mfem-4.7.patch

@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00d50283b..c9be1ddd0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,7 @@
++# This dummy patch is to prevent the real patch in MFEM's builtin Spack package from being applied.
++# All changes in mfem-4.7.patch are already in MFEM since 4.7.0.1.
++# Original patch: /~https://github.com/spack/spack/blob/develop/var/spack/repos/builtin/packages/mfem/mfem-4.7.patch
++
+ # Copyright (c) 2010-2024, Lawrence Livermore National Security, LLC. Produced
+ # at the Lawrence Livermore National Laboratory. All Rights reserved. See files
+ # LICENSE and NOTICE for details. LLNL-CODE-806117.