diff --git a/CMakeLists.txt b/CMakeLists.txt index a82642dd..355ebf2c 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-v2024.07.0.tar.gz") +set(RAJA_URL "${TPL_MIRROR_DIR}/RAJA-v2025.03.0.tar.gz") message(STATUS "Building RAJA found at ${RAJA_URL}") @@ -374,7 +374,7 @@ list(APPEND build_list raja ) # CHAI ################################ set(CHAI_DIR "${CMAKE_INSTALL_PREFIX}/chai") -set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2024.07.0.tar.gz") +set(CHAI_URL "${TPL_MIRROR_DIR}/chai-2025.03.0.tar.gz") message(STATUS "Building CHAI found at ${CHAI_URL}") ExternalProject_Add( chai diff --git a/docker/pangea-spack.yaml b/docker/pangea-spack.yaml index e5941ed4..41a58997 100644 --- a/docker/pangea-spack.yaml +++ b/docker/pangea-spack.yaml @@ -49,21 +49,21 @@ spack: hypre: require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2024.07.0 + # v2025.0.3.0 chai: - require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop" + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2024.07.0 + # v2025.0.3.0 umpire: - require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop" + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2024.07.0 + # v2025.0.3.0 raja: - require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop" + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2024.07.0 + # v2025.0.3.0 camp: - require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main" + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" # v2.12.0 caliper: diff --git a/docker/pecan-spack.yaml b/docker/pecan-spack.yaml index febbe0cf..0f97ec90 100644 --- a/docker/pecan-spack.yaml +++ b/docker/pecan-spack.yaml @@ -50,21 +50,21 @@ spack: hypre: require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2024.07.0 + # v2025.0.3.0 chai: - require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop" + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2024.07.0 + # v2025.0.3.0 umpire: - require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop" + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2024.07.0 + # v2025.0.3.0 raja: - require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop" + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2024.07.0 + # v2025.0.3.0 camp: - require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main" + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" # v2.12.0 caliper: diff --git a/docker/rocky-spack.yaml b/docker/rocky-spack.yaml index 41b3549e..0f5b08ba 100644 --- a/docker/rocky-spack.yaml +++ b/docker/rocky-spack.yaml @@ -55,7 +55,7 @@ spack: target: [x86_64] compiler: [gcc, clang] providers: - blas: [netlib-blas] + blas: [netlib-lapack] lapack: [netlib-lapack] mpi: [openmpi] @@ -67,21 +67,21 @@ spack: hypre: require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2024.07.0 + # v2025.0.3.0 chai: - require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop" + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2024.07.0 + # v2025.0.3.0 umpire: - require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop" + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2024.07.0 + # v2025.0.3.0 raja: - require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop" + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2024.07.0 + # v2025.0.3.0 camp: - require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main" + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" # v2.12.0 caliper: diff --git a/docker/spack.yaml b/docker/spack.yaml index 8eba0eef..c82e84cf 100644 --- a/docker/spack.yaml +++ b/docker/spack.yaml @@ -141,7 +141,7 @@ spack: target: [x86_64] compiler: [gcc, clang] providers: - blas: [netlib-blas] + blas: [netlib-lapack] lapack: [netlib-lapack] mpi: [openmpi] @@ -153,21 +153,21 @@ spack: hypre: require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2024.07.0 + # v2025.0.3.0 chai: - require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop" + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2024.07.0 + # v2025.0.3.0 umpire: - require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop" + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2024.07.0 + # v2025.0.3.0 raja: - require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop" + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2024.07.0 + # v2025.0.3.0 camp: - require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main" + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" # v2.12.0 caliper: diff --git a/docker/stanford-spack.yaml b/docker/stanford-spack.yaml index 25eab406..0e2ee449 100644 --- a/docker/stanford-spack.yaml +++ b/docker/stanford-spack.yaml @@ -50,21 +50,21 @@ spack: hypre: require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2024.07.0 + # v2025.0.3.0 chai: - require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop" + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2024.07.0 + # v2025.0.3.0 umpire: - require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop" + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2024.07.0 + # v2025.0.3.0 raja: - require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop" + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2024.07.0 + # v2025.0.3.0 camp: - require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main" + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" # v2.12.0 caliper: diff --git a/scripts/setupLC-TPL-uberenv-helper.bash b/scripts/setupLC-TPL-uberenv-helper.bash index 4cbb61ff..8bf5feeb 100755 --- a/scripts/setupLC-TPL-uberenv-helper.bash +++ b/scripts/setupLC-TPL-uberenv-helper.bash @@ -30,8 +30,24 @@ exit" > $LOG_FILE 2>&1 ## A successful install should show up on one of the final lines. tail -10 $LOG_FILE | grep -E "Successfully installed geos" > /dev/null if [ $? -eq 0 ]; then - chmod g+rx -R $INSTALL_DIR - chgrp GEOS -R $INSTALL_DIR + echo "Cleanup extra build files at ${INSTALL_DIR}/${CONFIG}_tpls/ ." + rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/${CONFIG}_env + rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/.spack-db + rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/misc_cache + rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/spack + rm -rf ${INSTALL_DIR}/${CONFIG}_tpls/build_stage + + echo "Updating file permissions at ${INSTALL_DIR}/${CONFIG}_tpls/ ." + # Install directory root + chmod g+rx $INSTALL_DIR + chgrp GEOS $INSTALL_DIR + + # Update only executable and library directories to avoid NFS errors + chmod g+rx -R $INSTALL_DIR/${CONFIG}_tpls/bin + chgrp GEOS -R $INSTALL_DIR/${CONFIG}_tpls/bin + chmod g+rx -R $INSTALL_DIR/${CONFIG}_tpls/${COMPILER%%-*}* + chgrp GEOS -R $INSTALL_DIR/${CONFIG}_tpls/${COMPILER%%-*}* + echo "Build of ${CONFIG} completed successfully." exit 0 else diff --git a/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml b/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml index 5e2ccda1..045401d1 100644 --- a/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -106,21 +106,21 @@ spack: hypre: require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2024.07.0 + # v2025.0.3.0 chai: - require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop" + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2024.07.0 + # v2025.0.3.0 umpire: - require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop" + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2024.07.0 + # v2025.0.3.0 raja: - require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop" + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2024.07.0 + # v2025.0.3.0 camp: - require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main" + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" # v2.12.0 caliper: diff --git a/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml b/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml index f713ef8d..e66cd9ce 100644 --- a/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml @@ -102,21 +102,21 @@ spack: hypre: require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2024.07.0 + # v2025.0.3.0 chai: - require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop" + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2024.07.0 + # v2025.0.3.0 umpire: - require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop" + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2024.07.0 + # v2025.0.3.0 raja: - require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop" + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2024.07.0 + # v2025.0.3.0 camp: - require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main" + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" # v2.12.0 caliper: diff --git a/scripts/spack_packages/packages/geosx/package.py b/scripts/spack_packages/packages/geosx/package.py index eccb9da4..8a8a6f52 100644 --- a/scripts/spack_packages/packages/geosx/package.py +++ b/scripts/spack_packages/packages/geosx/package.py @@ -235,6 +235,7 @@ def _get_host_config_path(self, spec, lvarray=False): var = '' if '+cuda' in spec: var = '-'.join([var, 'cuda']) + var += "@" + str(spec['cuda'].version) hostname = socket.gethostname().rstrip('1234567890') diff --git a/tplMirror/RAJA-v2024.07.0.tar.gz b/tplMirror/RAJA-v2024.07.0.tar.gz deleted file mode 100644 index 4588e813..00000000 --- a/tplMirror/RAJA-v2024.07.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf5f4b07abfe20076cecc030d227f6dd4b499ef2275ce8465da2c0e6da4b0b56 -size 10927064 diff --git a/tplMirror/RAJA-v2025.03.0.tar.gz b/tplMirror/RAJA-v2025.03.0.tar.gz new file mode 100644 index 00000000..49233dc7 --- /dev/null +++ b/tplMirror/RAJA-v2025.03.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60d047e04e7e7855f7b31e5f54bf66e465c52a6efb3871ace33cc8da1cb1b9ae +size 11182913 diff --git a/tplMirror/chai-2024.07.0.tar.gz b/tplMirror/chai-2024.07.0.tar.gz deleted file mode 100644 index 3e544748..00000000 --- a/tplMirror/chai-2024.07.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05919e45f449290b67c63801cce3ca65589f83c02f58058b49f4ca36fbe66160 -size 23249235 diff --git a/tplMirror/chai-2025.03.0.tar.gz b/tplMirror/chai-2025.03.0.tar.gz new file mode 100644 index 00000000..088ebdda --- /dev/null +++ b/tplMirror/chai-2025.03.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:144917f3185b7d112392e9f99c1fbc74b9e0be79cdbee445e0879ea2487d3d73 +size 23937809 diff --git a/tplMirror/umpire_fcompare-debug-second.patch b/tplMirror/umpire_fcompare-debug-second.patch deleted file mode 100644 index da7b57e1..00000000 --- a/tplMirror/umpire_fcompare-debug-second.patch +++ /dev/null @@ -1,17 +0,0 @@ -*** src/tpl/umpire/src/tpl/CMakeLists.txt 2023-07-06 14:40:05.000000000 -0700 ---- src/tpl/umpire/src/tpl/CMakeLists.txt.patch 2024-01-10 12:16:01.869448000 -0800 -*************** -*** 193,204 **** - endif () - endif () - -- if (C_COMPILER_FAMILY_IS_GNU) -- target_compile_options(umpire_tpl_fmt -- INTERFACE -- $<$:-fcompare-debug-second>) -- endif () -- - install(TARGETS - umpire_tpl_fmt - EXPORT umpire-targets ---- 193,198 ----