From 6c9556ac19ab6475868da28c1a04de76e07427cb Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Tue, 24 Feb 2026 12:06:21 -0500 Subject: [PATCH 01/11] Fix zlib issue --- scripts/spack_packages/packages/geosx/package.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index 3bcac0cb..498f6b55 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -532,7 +532,20 @@ def geos_hostconfig(self, spec, prefix, py_site_pkgs_dir=None): for tpl, cmake_name, enable in io_tpls: if enable: - cfg.write(cmake_cache_entry('{}_DIR'.format(cmake_name), spec[tpl].prefix)) + dep_spec = None + if tpl == 'zlib': + # Spack may concretize zlib-api to zlib-ng instead of zlib. + for candidate in ('zlib', 'zlib-ng', 'zlib-api'): + try: + dep_spec = spec[candidate] + break + except KeyError: + pass + if dep_spec is None: + raise KeyError("No zlib provider (zlib/zlib-ng/zlib-api) found in {0}".format(spec)) + else: + dep_spec = spec[tpl] + cfg.write(cmake_cache_entry('{}_DIR'.format(cmake_name), dep_spec.prefix)) else: cfg.write(cmake_cache_option('ENABLE_{}'.format(cmake_name), False)) From 63e4a835e02a689e3e62773dc933ba018f1197f4 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Wed, 25 Feb 2026 08:51:39 -0500 Subject: [PATCH 02/11] Add cxxstd variant to geos package --- scripts/spack_packages/packages/geosx/package.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index 498f6b55..2031d853 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -76,6 +76,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): multi=False) variant('grpc', default=False, description='Enable gRPC.') variant('pygeosx', default=True, description='Enable pygeosx.') + variant('cxxstd', default='17', description='CXX standard.') # SPHINX_END_VARIANTS @@ -156,7 +157,9 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): depends_on('pugixml@1.13 ~shared') - depends_on('fmt@10.0.0 cxxstd=14') + depends_on('fmt@11') + for _fmt_cxxstd in ('14', '17', '20'): + depends_on(f'fmt@11 cxxstd={_fmt_cxxstd}', when=f'cxxstd={_fmt_cxxstd}') depends_on('vtk@9.4.2', when='+vtk') # @@ -355,7 +358,7 @@ def geos_hostconfig(self, spec, prefix, py_site_pkgs_dir=None): cfg.write("# CMake Standard\n") cfg.write("#{0}\n\n".format("-" * 80)) - cfg.write(cmake_cache_string("BLT_CXX_STD", "c++17")) + cfg.write(cmake_cache_string("BLT_CXX_STD", f"c++{spec.variants['cxxstd'].value}")) cfg.write("#{0}\n".format("-" * 80)) cfg.write("# MPI\n") @@ -439,7 +442,7 @@ def geos_hostconfig(self, spec, prefix, py_site_pkgs_dir=None): cfg.write('#{0}\n\n'.format('-' * 80)) if '+cuda' in spec: cfg.write(cmake_cache_option('ENABLE_CUDA', True)) - cfg.write(cmake_cache_entry('CMAKE_CUDA_STANDARD', 17)) + cfg.write(cmake_cache_string('CMAKE_CUDA_STANDARD', spec.variants['cxxstd'].value)) cudatoolkitdir = spec['cuda'].prefix cfg.write(cmake_cache_entry('CUDA_TOOLKIT_ROOT_DIR', cudatoolkitdir)) @@ -484,7 +487,7 @@ def geos_hostconfig(self, spec, prefix, py_site_pkgs_dir=None): cfg.write('#{0}\n\n'.format('-' * 80)) if '+rocm' in spec: cfg.write(cmake_cache_option('ENABLE_HIP', True)) - cfg.write(cmake_cache_string('CMAKE_HIP_STANDARD', 17)) + cfg.write(cmake_cache_string('CMAKE_HIP_STANDARD', spec.variants['cxxstd'].value)) cfg.write(cmake_cache_entry('CMAKE_HIP_COMPILER', spec['hip'].prefix.bin.hipcc)) if not spec.satisfies('amdgpu_target=none'): @@ -767,7 +770,7 @@ def lvarray_hostconfig(self, spec, prefix, py_site_pkgs_dir=None): cfg.write('#{0}\n\n'.format('-' * 80)) if '+cuda' in spec: cfg.write(cmake_cache_option('ENABLE_CUDA', True)) - cfg.write(cmake_cache_entry('CMAKE_CUDA_STANDARD', 17)) + cfg.write(cmake_cache_string('CMAKE_CUDA_STANDARD', spec.variants['cxxstd'].value)) cudatoolkitdir = spec['cuda'].prefix cfg.write(cmake_cache_entry('CUDA_TOOLKIT_ROOT_DIR', cudatoolkitdir)) From b7a82ebf2946e1d00155c951fa2e097ddb4c1cfc Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Wed, 25 Feb 2026 13:50:56 -0500 Subject: [PATCH 03/11] [Update]: caliper v2.12.0 -> v2.14.0 --- CMakeLists.txt | 2 +- scripts/spack_configs/versions.yaml | 4 ---- scripts/spack_packages/packages/geosx/package.py | 2 +- tplMirror/Caliper-2.12.0.tar.gz | 3 --- tplMirror/Caliper-2.14.0.tar.gz | 3 +++ 5 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 tplMirror/Caliper-2.12.0.tar.gz create mode 100644 tplMirror/Caliper-2.14.0.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index 588800b3..a5b7c3d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -448,7 +448,7 @@ if (ENABLE_CALIPER) set(CALIPER_DIR "${CMAKE_INSTALL_PREFIX}/caliper") - set(CALIPER_URL "${TPL_MIRROR_DIR}/Caliper-2.12.0.tar.gz") + set(CALIPER_URL "${TPL_MIRROR_DIR}/Caliper-2.14.0.tar.gz") message(STATUS "Building Caliper found at ${CALIPER_URL}") set(CALIPER_WITH_CUPTI OFF) diff --git a/scripts/spack_configs/versions.yaml b/scripts/spack_configs/versions.yaml index 5708dbb8..9f350eb2 100644 --- a/scripts/spack_configs/versions.yaml +++ b/scripts/spack_configs/versions.yaml @@ -38,10 +38,6 @@ packages: camp: require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - # v0.9.2 conduit: require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index 2031d853..771b3d39 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -153,7 +153,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): depends_on('conduit~test~fortran~hdf5_compat+shared') depends_on('adiak@0.4.0 ~shared', when='+caliper') - depends_on('caliper~gotcha~sampler~libunwind~libdw', when='+caliper') + depends_on('caliper@2.14.0 ~gotcha~sampler~libunwind~libdw', when='+caliper') depends_on('pugixml@1.13 ~shared') diff --git a/tplMirror/Caliper-2.12.0.tar.gz b/tplMirror/Caliper-2.12.0.tar.gz deleted file mode 100644 index 12c4753f..00000000 --- a/tplMirror/Caliper-2.12.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e76d64905e4c17676d78047a8e84edbcbe4176edf789850fce42f69a7d9d1e2 -size 2089422 diff --git a/tplMirror/Caliper-2.14.0.tar.gz b/tplMirror/Caliper-2.14.0.tar.gz new file mode 100644 index 00000000..ddfa6526 --- /dev/null +++ b/tplMirror/Caliper-2.14.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b42c35dfbe485960dd326033893dae37ac00d9807c5c3e6b5b1f396bc4af273f +size 2093696 From 10766b05c38a385adddbc259a63463077b3ef528 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Wed, 25 Feb 2026 13:56:06 -0500 Subject: [PATCH 04/11] [Update]: RAJA v2025.03.0 -> v2025.12.0 --- CMakeLists.txt | 2 +- scripts/spack_configs/versions.yaml | 4 ---- scripts/spack_packages/packages/geosx/package.py | 2 +- tplMirror/RAJA-v2025.03.0.tar.gz | 3 --- tplMirror/RAJA-v2025.12.0.tar.gz | 3 +++ 5 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 tplMirror/RAJA-v2025.03.0.tar.gz create mode 100644 tplMirror/RAJA-v2025.12.0.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index a5b7c3d6..af831521 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -334,7 +334,7 @@ list(APPEND build_list silo ) set(RAJA_DIR "${CMAKE_INSTALL_PREFIX}/raja") -set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2025.03.0.tar.gz") +set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2025.12.0.tar.gz") message(STATUS "Building RAJA found at ${RAJA_URL}") diff --git a/scripts/spack_configs/versions.yaml b/scripts/spack_configs/versions.yaml index 9f350eb2..0f6aee42 100644 --- a/scripts/spack_configs/versions.yaml +++ b/scripts/spack_configs/versions.yaml @@ -30,10 +30,6 @@ packages: umpire: require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2025.0.3.0 camp: require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index 771b3d39..69116a8c 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -111,7 +111,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): # # Performance portability # - depends_on('raja ~examples~exercises~shared') + depends_on('raja @2025.12.0 ~examples~exercises~shared') depends_on("raja~openmp", when="~openmp") depends_on("raja+openmp", when="+openmp") diff --git a/tplMirror/RAJA-v2025.03.0.tar.gz b/tplMirror/RAJA-v2025.03.0.tar.gz deleted file mode 100644 index 49233dc7..00000000 --- a/tplMirror/RAJA-v2025.03.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60d047e04e7e7855f7b31e5f54bf66e465c52a6efb3871ace33cc8da1cb1b9ae -size 11182913 diff --git a/tplMirror/RAJA-v2025.12.0.tar.gz b/tplMirror/RAJA-v2025.12.0.tar.gz new file mode 100644 index 00000000..4a17ad92 --- /dev/null +++ b/tplMirror/RAJA-v2025.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e8b4656a79fe01f01b122947365537537505073e4a8dbf388ee85f105f678d2 +size 10997567 From 763a7ab92994e7e6d9a271b19118c030712f7f36 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Wed, 25 Feb 2026 14:02:11 -0500 Subject: [PATCH 05/11] [Update]: CHAI v2025.03.0 -> v2025.12.0 --- CMakeLists.txt | 2 +- scripts/spack_configs/versions.yaml | 4 ---- scripts/spack_packages/packages/geosx/package.py | 2 +- tplMirror/chai-2025.03.0.tar.gz | 3 --- tplMirror/chai-v2025.12.0.tar.gz | 3 +++ 5 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 tplMirror/chai-2025.03.0.tar.gz create mode 100644 tplMirror/chai-v2025.12.0.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index af831521..cd80f5db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,7 +374,7 @@ list(APPEND build_list raja ) # CHAI ################################ set(CHAI_DIR "${CMAKE_INSTALL_PREFIX}/chai") -set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2025.03.0.tar.gz") +set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2025.12.0.tar.gz") message(STATUS "Building CHAI found at ${CHAI_URL}") ExternalProject_Add( chai diff --git a/scripts/spack_configs/versions.yaml b/scripts/spack_configs/versions.yaml index 0f6aee42..5616aa39 100644 --- a/scripts/spack_configs/versions.yaml +++ b/scripts/spack_configs/versions.yaml @@ -22,10 +22,6 @@ packages: hypre: require: "@git.8b0093306228fef1b92384d9face7fbe5a63b460=master" - # v2025.0.3.0 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2025.0.3.0 umpire: require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index 69116a8c..836c6f0c 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -119,7 +119,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): depends_on("umpire~openmp", when="~openmp") depends_on("umpire+openmp", when="+openmp") - depends_on('chai +raja~examples~shared') + depends_on('chai @2025.12.0 +raja~examples~shared') depends_on("chai~openmp", when="~openmp") depends_on("chai+openmp", when="+openmp") diff --git a/tplMirror/chai-2025.03.0.tar.gz b/tplMirror/chai-2025.03.0.tar.gz deleted file mode 100644 index 088ebdda..00000000 --- a/tplMirror/chai-2025.03.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:144917f3185b7d112392e9f99c1fbc74b9e0be79cdbee445e0879ea2487d3d73 -size 23937809 diff --git a/tplMirror/chai-v2025.12.0.tar.gz b/tplMirror/chai-v2025.12.0.tar.gz new file mode 100644 index 00000000..897ff763 --- /dev/null +++ b/tplMirror/chai-v2025.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c77a17dbb1aade696681b7b747a7437f4e4252361d57dca1fe7edd20d5b1984b +size 23851995 From d35c6ec3633d69149f5ad658d056f257bcf21750 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Wed, 25 Feb 2026 14:19:56 -0500 Subject: [PATCH 06/11] [Update]: Umpire v2025.03.0 -> v2025.12.0 --- scripts/spack_configs/versions.yaml | 8 ------- .../spack_packages/packages/geosx/package.py | 22 +++++++------------ 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/scripts/spack_configs/versions.yaml b/scripts/spack_configs/versions.yaml index 5616aa39..b66561af 100644 --- a/scripts/spack_configs/versions.yaml +++ b/scripts/spack_configs/versions.yaml @@ -22,14 +22,6 @@ packages: hypre: require: "@git.8b0093306228fef1b92384d9face7fbe5a63b460=master" - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - # v0.9.2 conduit: require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index 836c6f0c..bdc4a91d 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -111,20 +111,14 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): # # Performance portability # - depends_on('raja @2025.12.0 ~examples~exercises~shared') - depends_on("raja~openmp", when="~openmp") - depends_on("raja+openmp", when="+openmp") - - depends_on('umpire +c~examples+fortran~device_alloc~shared') - depends_on("umpire~openmp", when="~openmp") - depends_on("umpire+openmp", when="+openmp") - - depends_on('chai @2025.12.0 +raja~examples~shared') - depends_on("chai~openmp", when="~openmp") - depends_on("chai+openmp", when="+openmp") - - depends_on('camp') - + raja_suite_version="2025.12.0" + depends_on(f"raja @{raja_suite_version} ~examples~exercises~shared") + depends_on(f"chai @{raja_suite_version} +raja~examples~shared") + depends_on(f"camp @{raja_suite_version}") + depends_on(f"umpire @{raja_suite_version} +c~examples+fortran~device_alloc~shared") + with when('+openmp'): + for pkg in ('raja', 'chai', 'umpire'): + depends_on(f"{pkg}+openmp", when="+openmp") # # GPUs # From 53939831f1cdecded39c460c0d33936de460f4e1 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Wed, 25 Feb 2026 14:22:26 -0500 Subject: [PATCH 07/11] [Update]: BLT v0.6.2 -> v0.7.1 --- cmake/blt | 2 +- scripts/spack_configs/versions.yaml | 4 ---- scripts/spack_packages/packages/geosx/package.py | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cmake/blt b/cmake/blt index 9ff77344..e783e30f 160000 --- a/cmake/blt +++ b/cmake/blt @@ -1 +1 @@ -Subproject commit 9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35 +Subproject commit e783e30f2823ee1a208f7f90741b41c1f5a08063 diff --git a/scripts/spack_configs/versions.yaml b/scripts/spack_configs/versions.yaml index b66561af..7c5da2af 100644 --- a/scripts/spack_configs/versions.yaml +++ b/scripts/spack_configs/versions.yaml @@ -14,10 +14,6 @@ # This file lists the package versions for geos's dependencies # packages: - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - # master - 01/23/26 hypre: require: "@git.8b0093306228fef1b92384d9face7fbe5a63b460=master" diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index bdc4a91d..1c1d119d 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -99,7 +99,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): depends_on('cmake@3.24:', type='build') - depends_on('blt') + depends_on('blt@0.7.1') # # Virtual packages From 82c423c02bb2af736994d1d71f9c1597f8a0996e Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Wed, 25 Feb 2026 14:23:45 -0500 Subject: [PATCH 08/11] Bump spack packages commit to Feb 25th 2026 --- .uberenv_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 5f201a4b..9ebb8c7b 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -8,6 +8,6 @@ "spack_url": "https://github.com/spack/spack", "spack_commit": "0c2be44e4ece21eb091ad5de4c97716b7c6d4c87", "spack_commit_note": "v1.1.0 (Nov 14th 2025)", -"spack_packages_commit": "cfa8d650480c409de2d568cf1355bf7e509f4c1c", -"spack_packages_note": "Jan 21st 2026" +"spack_packages_commit": "3dd98680871078353a28ee508fa76c7554f918fa", +"spack_packages_note": "Feb 25th 2026" } From 71af4359eafbd7ad693d0c7317796f6d5366a526 Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Fri, 27 Feb 2026 07:52:18 -0800 Subject: [PATCH 09/11] [Update]: conduit v0.9.2 -> v0.9.5 --- CMakeLists.txt | 7 ++++--- scripts/spack_configs/versions.yaml | 4 ---- scripts/spack_packages/packages/geosx/package.py | 2 +- tplMirror/conduit-0.9.2.tar.gz | 3 --- tplMirror/conduit-v0.9.5-src-with-blt.tar.gz | 3 +++ 5 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 tplMirror/conduit-0.9.2.tar.gz create mode 100644 tplMirror/conduit-v0.9.5-src-with-blt.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt index cd80f5db..aa5ed5aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ set( ENABLE_DOXYGEN OFF CACHE BOOL "" FORCE ) ################################ # BLT ################################ +set( CXX_STANDARD 17 ) set( BLT_CXX_STD c++17 CACHE STRING "" FORCE ) if (DEFINED BLT_SOURCE_DIR) @@ -235,7 +236,7 @@ list(APPEND build_list hdf5 ) # Conduit ################################ set(CONDUIT_DIR "${CMAKE_INSTALL_PREFIX}/conduit") -set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-0.9.2.tar.gz") +set(CONDUIT_URL "${TPL_MIRROR_DIR}/conduit-v0.9.5-src-with-blt.tar.gz") message(STATUS "Building Conduit found at ${CONDUIT_URL}") if( ${ENABLE_MPI} ) @@ -282,7 +283,7 @@ ExternalProject_Add( conduit -D CMAKE_INSTALL_PREFIX:PATH= -D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -D CMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} - -D BLT_CXX_STD:STRING=c++14 + -D BLT_CXX_STD:STRING=${BLT_CXX_STD} ) list(APPEND build_list conduit ) @@ -1204,7 +1205,7 @@ ExternalProject_Add( fmt -D CMAKE_INSTALL_PREFIX:PATH= -D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -D CMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE} - -D CMAKE_CXX_STANDARD=14 + -D CMAKE_CXX_STANDARD=${CXX_STANDARD} -D CMAKE_CXX_VISIBILITY_PRESET:STRING=default -D CMAKE_VISIBILITY_INLINES_HIDDEN:BOOL=OFF -D FMT_TEST:BOOL=OFF ) diff --git a/scripts/spack_configs/versions.yaml b/scripts/spack_configs/versions.yaml index 7c5da2af..293a75ba 100644 --- a/scripts/spack_configs/versions.yaml +++ b/scripts/spack_configs/versions.yaml @@ -18,10 +18,6 @@ packages: hypre: require: "@git.8b0093306228fef1b92384d9face7fbe5a63b460=master" - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - # master - 04/12/20 uncrustify: require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index 1c1d119d..82a0cd38 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -144,7 +144,7 @@ class Geosx(CMakePackage, CudaPackage, ROCmPackage): depends_on('hdf5@1.14.6') depends_on('silo@4.12.0~fortran~shared~python build_system=cmake') - depends_on('conduit~test~fortran~hdf5_compat+shared') + depends_on('conduit@0.9.5 ~test~fortran~hdf5_compat+shared') depends_on('adiak@0.4.0 ~shared', when='+caliper') depends_on('caliper@2.14.0 ~gotcha~sampler~libunwind~libdw', when='+caliper') diff --git a/tplMirror/conduit-0.9.2.tar.gz b/tplMirror/conduit-0.9.2.tar.gz deleted file mode 100644 index 3c2c7838..00000000 --- a/tplMirror/conduit-0.9.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a5368bf2232e927db84d14b917c587a82389ca50d5a8e2b1f52bf7764a9f6cb -size 23576501 diff --git a/tplMirror/conduit-v0.9.5-src-with-blt.tar.gz b/tplMirror/conduit-v0.9.5-src-with-blt.tar.gz new file mode 100644 index 00000000..cbb1cb93 --- /dev/null +++ b/tplMirror/conduit-v0.9.5-src-with-blt.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d93294efbf0936da5a27941e13486aa1a04a74a59285786a2303eed19a24265a +size 109117490 From 059053cff15bf28fbe9642e11d5beb6d8bbc0bae Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Fri, 27 Feb 2026 07:54:55 -0800 Subject: [PATCH 10/11] Fix LC-uberenv script so that the compiler choice is propagated to deps --- scripts/setupLC-TPL-uberenv.bash | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/setupLC-TPL-uberenv.bash b/scripts/setupLC-TPL-uberenv.bash index a1ecf267..a915e677 100755 --- a/scripts/setupLC-TPL-uberenv.bash +++ b/scripts/setupLC-TPL-uberenv.bash @@ -89,24 +89,24 @@ function launch_jobs() { case "$machine" in dane) ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex" - "${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-12 "+docs %gcc-12 ${COMMON}" "${ALLOC_CMD}" "$@" & - "${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-13 "+docs %gcc-13 ${COMMON}" "${ALLOC_CMD}" "$@" & - "${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-14 "+docs %clang-14 ${COMMON}" "${ALLOC_CMD}" "$@" & - "${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-19 "+docs %clang-19 ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-12 "+docs %%gcc-12 ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" dane gcc-13 "+docs %%gcc-13 ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-14 "+docs %%clang-14 ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" dane llvm-19 "+docs %%clang-19 ${COMMON}" "${ALLOC_CMD}" "$@" & ;; matrix) ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex" - "${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-12-cuda-12.6 "+cuda~uncrustify cuda_arch=90 %gcc-12 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" & - "${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-13-cuda-12.9 "+cuda~uncrustify cuda_arch=90 %gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" & - "${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-14-cuda-12.6 "+cuda~uncrustify cuda_arch=90 %clang-14 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" & - "${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-19-cuda-12.9 "+cuda~uncrustify cuda_arch=90 %clang-19 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-12-cuda-12.6 "+cuda~uncrustify cuda_arch=90 %%gcc-12 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" matrix gcc-13-cuda-12.9 "+cuda~uncrustify cuda_arch=90 %%gcc-13 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-14-cuda-12.6 "+cuda~uncrustify cuda_arch=90 %%clang-14 ^cuda@12.6.0+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" matrix llvm-19-cuda-12.9 "+cuda~uncrustify cuda_arch=90 %%clang-19 ^cuda@12.9.1+allow-unsupported-compilers ${COMMON}" "${ALLOC_CMD}" "$@" & ;; tuo|tuolumne) ALLOC_CMD="srun -N 1 --exclusive -t 60 -A vortex" - "${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne cce-20-rocm-6.4.2 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %cce-20 ${COMMON}" "${ALLOC_CMD}" "$@" & - "${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne llvm-amdgpu-6.4.2-rocm-6.4.2 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %llvm-amdgpu_6_4_2 ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne cce-20-rocm-6.4.2 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %%cce-20 ${COMMON}" "${ALLOC_CMD}" "$@" & + "${UBERENV_HELPER}" "$INSTALL_DIR" tuolumne llvm-amdgpu-6.4.2-rocm-6.4.2 "+rocm~pygeosx~trilinos~petsc~docs amdgpu_target=gfx942 %%llvm-amdgpu_6_4_2 ${COMMON}" "${ALLOC_CMD}" "$@" & ;; *) From a84a48473e0ab415b32662f0b821f300305b708d Mon Sep 17 00:00:00 2001 From: "Victor A. P. Magri" Date: Fri, 27 Feb 2026 08:02:19 -0800 Subject: [PATCH 11/11] [Update]: spack v1.1.0 -> v1.1.1 --- .uberenv_config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.uberenv_config.json b/.uberenv_config.json index 9ebb8c7b..b541fb7c 100644 --- a/.uberenv_config.json +++ b/.uberenv_config.json @@ -6,8 +6,8 @@ "spack_configs_path": "scripts/spack_configs", "spack_packages_path": "scripts/spack_packages/packages", "spack_url": "https://github.com/spack/spack", -"spack_commit": "0c2be44e4ece21eb091ad5de4c97716b7c6d4c87", -"spack_commit_note": "v1.1.0 (Nov 14th 2025)", +"spack_commit": "2e2169d5282d166f63e3ee4db8d4446c43cefa8a", +"spack_commit_note": "v1.1.1 (Jan 14th 2026)", "spack_packages_commit": "3dd98680871078353a28ee508fa76c7554f918fa", "spack_packages_note": "Feb 25th 2026" }