From f7f181f71b2e3a8eb3303e9c16466d47e28032dc Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 29 May 2025 08:11:52 -0700 Subject: [PATCH 1/7] Update uberenv hash with version and default changes --- scripts/uberenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/uberenv b/scripts/uberenv index 205672b8..a76a2942 160000 --- a/scripts/uberenv +++ b/scripts/uberenv @@ -1 +1 @@ -Subproject commit 205672b8b2520d7dc69acefe8738960cd5db0937 +Subproject commit a76a2942f0b575f7d9047dfb87d699e2b6d18f12 From ac199f99cd9fec36b5cbadc5b880dc2e0e9bfca6 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 29 May 2025 13:27:42 -0700 Subject: [PATCH 2/7] Consolidate versions --- docker/pangea-spack.yaml | 43 ++------------- docker/pecan-spack.yaml | 43 ++------------- docker/rocky-spack.yaml | 43 ++------------- docker/spack.yaml | 43 ++------------- docker/stanford-spack.yaml | 42 ++------------ .../blueos_3_ppc64le_ib_p9/spack.yaml | 42 ++------------ scripts/spack_configs/defaults.yaml | 16 ++++++ scripts/spack_configs/macOS/spack.yaml | 43 ++------------- scripts/spack_configs/pangea-3/spack.yaml | 39 ++----------- scripts/spack_configs/pangea-4/spack.yaml | 39 ++----------- .../spack_configs/toss_4_x86_64_ib/spack.yaml | 40 ++------------ scripts/spack_configs/versions.yaml | 55 +++++++++++++++++++ 12 files changed, 121 insertions(+), 367 deletions(-) create mode 100644 scripts/spack_configs/defaults.yaml create mode 100644 scripts/spack_configs/versions.yaml diff --git a/docker/pangea-spack.yaml b/docker/pangea-spack.yaml index 9feca4ab..47b43ba4 100644 --- a/docker/pangea-spack.yaml +++ b/docker/pangea-spack.yaml @@ -12,6 +12,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../scripts/spack_configs/defaults.yaml + - ../scripts/spack_configs/versions.yaml + compilers:: - compiler: spec: gcc@=9.4.0 @@ -41,44 +46,6 @@ spack: lapack: [openblas] mpi: [openmpi] - - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - - hypre: - require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" - - # v2025.0.3.0 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - autoconf: externals: - spec: autoconf@2.69 diff --git a/docker/pecan-spack.yaml b/docker/pecan-spack.yaml index 69ddd4af..dbb7dd2d 100644 --- a/docker/pecan-spack.yaml +++ b/docker/pecan-spack.yaml @@ -12,6 +12,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../scripts/spack_configs/defaults.yaml + - ../scripts/spack_configs/versions.yaml + compilers:: # Pecan CPU/GPU compiler - compiler: @@ -42,44 +47,6 @@ spack: lapack: [intel-mkl] mpi: [openmpi] - - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - - hypre: - require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" - - # v2025.0.3.0 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - autoconf: version: [2.71] buildable: false diff --git a/docker/rocky-spack.yaml b/docker/rocky-spack.yaml index 7b202565..443e64b2 100644 --- a/docker/rocky-spack.yaml +++ b/docker/rocky-spack.yaml @@ -12,6 +12,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../scripts/spack_configs/defaults.yaml + - ../scripts/spack_configs/versions.yaml + compilers:: - compiler: environment: @@ -59,44 +64,6 @@ spack: lapack: [netlib-lapack] mpi: [openmpi] - - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - - hypre: - require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" - - # v2025.0.3.0 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - autoconf: version: [2.71] buildable: false diff --git a/docker/spack.yaml b/docker/spack.yaml index 25f41a84..e9e81b81 100644 --- a/docker/spack.yaml +++ b/docker/spack.yaml @@ -12,6 +12,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../scripts/spack_configs/defaults.yaml + - ../scripts/spack_configs/versions.yaml + compilers:: - compiler: environment: @@ -145,44 +150,6 @@ spack: lapack: [netlib-lapack] mpi: [openmpi] - - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - - hypre: - require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" - - # v2025.0.3.0 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - autoconf: version: [2.71] buildable: false diff --git a/docker/stanford-spack.yaml b/docker/stanford-spack.yaml index d1b8526c..a3c88c96 100644 --- a/docker/stanford-spack.yaml +++ b/docker/stanford-spack.yaml @@ -13,6 +13,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../scripts/spack_configs/defaults.yaml + - ../scripts/spack_configs/versions.yaml + compilers:: # Sherlock CPU/GPU Compiler (centos7 x86_64) - compiler: @@ -43,43 +48,6 @@ spack: blas: [openblas] lapack: [openblas] - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - - hypre: - require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" - - # v2025.0.3.0 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - autoconf: buildable: false externals: 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 d0231250..c3fe5b47 100644 --- a/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml +++ b/scripts/spack_configs/blueos_3_ppc64le_ib_p9/spack.yaml @@ -39,6 +39,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../defaults.yaml + - ../versions.yaml + compilers:: - compiler: spec: clang@10.0.1 @@ -117,43 +122,6 @@ spack: blas: [essl] lapack: [essl] - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - - hypre: - require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" - - # v2025.0.3.0 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - spectrum-mpi: buildable: False externals: diff --git a/scripts/spack_configs/defaults.yaml b/scripts/spack_configs/defaults.yaml new file mode 100644 index 00000000..6b36e02e --- /dev/null +++ b/scripts/spack_configs/defaults.yaml @@ -0,0 +1,16 @@ +#------------------------------------------------------------------------------------------------------------ +# SPDX-License-Identifier: LGPL-2.1-only +# +# Copyright (c) 2018-2020 Lawrence Livermore National Security LLC +# Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2018-2020 TotalEnergies +# Copyright (c) 2019- GEOSX Contributors +# All rights reserved +# +# See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details. +#------------------------------------------------------------------------------------------------------------ + +# +# This file lists the default package variants for geos's dependencies +# (empty for now - default variants defined in the package.py for geos) +# diff --git a/scripts/spack_configs/macOS/spack.yaml b/scripts/spack_configs/macOS/spack.yaml index 64828992..0b260f39 100644 --- a/scripts/spack_configs/macOS/spack.yaml +++ b/scripts/spack_configs/macOS/spack.yaml @@ -12,6 +12,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../scripts/spack_configs/defaults.yaml + - ../scripts/spack_configs/versions.yaml + compilers: - compiler: spec: apple-clang@16.0.0 @@ -71,44 +76,6 @@ spack: - spec: openblas@0.3.29 prefix: /opt/homebrew/opt/openblas - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - - # master - 10/18/24 - hypre: - require: "@git.c893886d15eb57e87dd36efec23693ece3ddc88e" - - # v2024.07.0 - chai: - require: "@git.df7741f1dbbdc5fff5f7d626151fdf1904e62b19=develop" - - # v2024.07.0 - umpire: - require: "@git.abd729f40064175e999a83d11d6b073dac4c01d2=develop" - - # v2024.07.0 - raja: - require: "@git.4d7fcba55ebc7cb972b7cc9f6778b48e43792ea1=develop" - - # v2024.07.0 - camp: - require: "@git.0f07de4240c42e0b38a8d872a20440cb4b33d9f5=main" - - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - # Lock down which MPI we are using openmpi: buildable: False diff --git a/scripts/spack_configs/pangea-3/spack.yaml b/scripts/spack_configs/pangea-3/spack.yaml index 5699d016..eac7c0a6 100644 --- a/scripts/spack_configs/pangea-3/spack.yaml +++ b/scripts/spack_configs/pangea-3/spack.yaml @@ -24,6 +24,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../scripts/spack_configs/defaults.yaml + - ../scripts/spack_configs/versions.yaml + ############# # COMPILERS # ############# @@ -73,40 +78,6 @@ spack: lapack: buildable: false - #### - # spec of packages to build for - - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - # v2.32.0-33 - hypre: - require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2025.0.3 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - # master - 04/12/20 - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - # master - 04/26/20 - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - #### # spec of spack packages to reuse berkeley-db: diff --git a/scripts/spack_configs/pangea-4/spack.yaml b/scripts/spack_configs/pangea-4/spack.yaml index 01c09bbc..b3227ab9 100644 --- a/scripts/spack_configs/pangea-4/spack.yaml +++ b/scripts/spack_configs/pangea-4/spack.yaml @@ -23,6 +23,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../scripts/spack_configs/defaults.yaml + - ../scripts/spack_configs/versions.yaml + ############# # COMPILERS # ############# @@ -70,40 +75,6 @@ spack: lapack: buildable: false - #### - # spec of packages to build for - - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - # v2.32.0-33 - hypre: - require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2025.0.3 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - # master - 04/12/20 - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - # master - 04/26/20 - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - #### # spec of spack packages to reuse 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 01446c41..a3de2223 100644 --- a/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml +++ b/scripts/spack_configs/toss_4_x86_64_ib/spack.yaml @@ -37,6 +37,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../defaults.yaml + - ../versions.yaml + compilers:: - compiler: spec: clang@14.0.6 @@ -95,42 +100,7 @@ spack: blas: [intel-oneapi-mkl] lapack: [intel-oneapi-mkl] - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - - hypre: - require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" - - # v2025.0.3.0 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" # Lock down which MPI we are using mvapich2: diff --git a/scripts/spack_configs/versions.yaml b/scripts/spack_configs/versions.yaml new file mode 100644 index 00000000..3cc43562 --- /dev/null +++ b/scripts/spack_configs/versions.yaml @@ -0,0 +1,55 @@ +#------------------------------------------------------------------------------------------------------------ +# SPDX-License-Identifier: LGPL-2.1-only +# +# Copyright (c) 2018-2020 Lawrence Livermore National Security LLC +# Copyright (c) 2018-2020 The Board of Trustees of the Leland Stanford Junior University +# Copyright (c) 2018-2020 TotalEnergies +# Copyright (c) 2019- GEOSX Contributors +# All rights reserved +# +# See top level LICENSE, COPYRIGHT, CONTRIBUTORS, NOTICE, and ACKNOWLEDGEMENTS files for details. +#------------------------------------------------------------------------------------------------------------ + +# +# This file lists the package versions for geos's dependencies +# +packages: + # v0.6.2 + blt: + require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" + + # master - 05/05/25 + hypre: + require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" + + # v2025.0.3.0 + chai: + require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" + + # v2025.0.3.0 + umpire: + require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" + + # v2025.0.3.0 + raja: + require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" + + # v2025.0.3.0 + camp: + require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" + + # v2.12.0 + caliper: + require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" + + # v0.9.2 + conduit: + require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" + + # master - 04/12/20 + uncrustify: + require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" + + # master - 04/26/20 + superlu-dist: + require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" From e9de4ddfbf4fcc3ec53a9e5e50fc97d9ce48ddc3 Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 29 May 2025 16:30:07 -0700 Subject: [PATCH 3/7] Change include path, add missing dependencies for spack bootstrap now --- docker/Stanford/Dockerfile | 1 + docker/TotalEnergies/Dockerfile | 1 + docker/TotalEnergies/Pangea3.Dockerfile | 1 + docker/TotalEnergies/pecan.Dockerfile | 1 + docker/pangea-spack.yaml | 4 ++-- docker/pecan-spack.yaml | 4 ++-- docker/rocky-spack.yaml | 4 ++-- docker/spack.yaml | 5 +++-- docker/stanford-spack.yaml | 4 ++-- docker/tpl-centos-gcc-cuda.Dockerfile | 1 + docker/tpl-rockylinux-clang-cuda-12.Dockerfile | 1 + docker/tpl-rockylinux-gcc-cuda-12.Dockerfile | 1 + docker/tpl-ubuntu-clang-cuda.Dockerfile | 2 ++ docker/tpl-ubuntu-clang.Dockerfile | 2 ++ docker/tpl-ubuntu-gcc.Dockerfile | 2 ++ scripts/spack_configs/macOS/spack.yaml | 4 ++-- scripts/spack_configs/pangea-3/spack.yaml | 4 ++-- scripts/spack_configs/pangea-4/spack.yaml | 4 ++-- 18 files changed, 30 insertions(+), 16 deletions(-) diff --git a/docker/Stanford/Dockerfile b/docker/Stanford/Dockerfile index 07489b10..3fab5756 100644 --- a/docker/Stanford/Dockerfile +++ b/docker/Stanford/Dockerfile @@ -23,6 +23,7 @@ RUN yum install -y \ # xz \ unzip \ bzip2 \ + gnupg \ && pip3 install virtualenv # Set locale to bypass ascii codec decode error diff --git a/docker/TotalEnergies/Dockerfile b/docker/TotalEnergies/Dockerfile index 2c796542..ceb996cb 100644 --- a/docker/TotalEnergies/Dockerfile +++ b/docker/TotalEnergies/Dockerfile @@ -22,6 +22,7 @@ RUN yum install --disablerepo=intel-mkl-repo -y \ # xz \ unzip \ bzip2 \ + gnupg2 \ && pip3 install virtualenv # Install clingo for Spack diff --git a/docker/TotalEnergies/Pangea3.Dockerfile b/docker/TotalEnergies/Pangea3.Dockerfile index bfad0260..23523a27 100644 --- a/docker/TotalEnergies/Pangea3.Dockerfile +++ b/docker/TotalEnergies/Pangea3.Dockerfile @@ -18,6 +18,7 @@ RUN dnf clean all && \ automake \ libtool \ bzip2 \ + gnupg2 \ unzip # All the environment variables defined in this Dockerfile diff --git a/docker/TotalEnergies/pecan.Dockerfile b/docker/TotalEnergies/pecan.Dockerfile index 3e19fbef..d89aa46c 100644 --- a/docker/TotalEnergies/pecan.Dockerfile +++ b/docker/TotalEnergies/pecan.Dockerfile @@ -34,6 +34,7 @@ RUN yum install -y \ gcc-c++ \ wget \ bzip2 \ + gnupg \ zlib-devel WORKDIR /tmp/src diff --git a/docker/pangea-spack.yaml b/docker/pangea-spack.yaml index 47b43ba4..96a8fff8 100644 --- a/docker/pangea-spack.yaml +++ b/docker/pangea-spack.yaml @@ -14,8 +14,8 @@ spack: # Include shared variants and versions include: - - ../scripts/spack_configs/defaults.yaml - - ../scripts/spack_configs/versions.yaml + - ../defaults.yaml + - ../versions.yaml compilers:: - compiler: diff --git a/docker/pecan-spack.yaml b/docker/pecan-spack.yaml index dbb7dd2d..4f0a9d33 100644 --- a/docker/pecan-spack.yaml +++ b/docker/pecan-spack.yaml @@ -14,8 +14,8 @@ spack: # Include shared variants and versions include: - - ../scripts/spack_configs/defaults.yaml - - ../scripts/spack_configs/versions.yaml + - ../defaults.yaml + - ../versions.yaml compilers:: # Pecan CPU/GPU compiler diff --git a/docker/rocky-spack.yaml b/docker/rocky-spack.yaml index 443e64b2..d772d515 100644 --- a/docker/rocky-spack.yaml +++ b/docker/rocky-spack.yaml @@ -14,8 +14,8 @@ spack: # Include shared variants and versions include: - - ../scripts/spack_configs/defaults.yaml - - ../scripts/spack_configs/versions.yaml + - ../defaults.yaml + - ../versions.yaml compilers:: - compiler: diff --git a/docker/spack.yaml b/docker/spack.yaml index e9e81b81..ce8a914f 100644 --- a/docker/spack.yaml +++ b/docker/spack.yaml @@ -14,8 +14,9 @@ spack: # Include shared variants and versions include: - - ../scripts/spack_configs/defaults.yaml - - ../scripts/spack_configs/versions.yaml + - ../defaults.yaml + - ../versions.yaml + compilers:: - compiler: diff --git a/docker/stanford-spack.yaml b/docker/stanford-spack.yaml index a3c88c96..67b129e0 100644 --- a/docker/stanford-spack.yaml +++ b/docker/stanford-spack.yaml @@ -15,8 +15,8 @@ spack: # Include shared variants and versions include: - - ../scripts/spack_configs/defaults.yaml - - ../scripts/spack_configs/versions.yaml + - ../defaults.yaml + - ../versions.yaml compilers:: # Sherlock CPU/GPU Compiler (centos7 x86_64) diff --git a/docker/tpl-centos-gcc-cuda.Dockerfile b/docker/tpl-centos-gcc-cuda.Dockerfile index 1414fe42..deb79029 100644 --- a/docker/tpl-centos-gcc-cuda.Dockerfile +++ b/docker/tpl-centos-gcc-cuda.Dockerfile @@ -48,6 +48,7 @@ RUN yum -y install \ # xz \ unzip \ bzip2 \ + gnupg \ && pip3 install virtualenv # Install clingo for Spack diff --git a/docker/tpl-rockylinux-clang-cuda-12.Dockerfile b/docker/tpl-rockylinux-clang-cuda-12.Dockerfile index a761b40e..2ada895f 100644 --- a/docker/tpl-rockylinux-clang-cuda-12.Dockerfile +++ b/docker/tpl-rockylinux-clang-cuda-12.Dockerfile @@ -28,6 +28,7 @@ RUN dnf clean all && \ unzip \ mpfr-devel \ bzip2 \ + gnupg \ xz \ python3-virtualenv diff --git a/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile b/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile index a63229a6..28a69524 100644 --- a/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile +++ b/docker/tpl-rockylinux-gcc-cuda-12.Dockerfile @@ -27,6 +27,7 @@ RUN dnf clean all && \ unzip \ mpfr-devel \ bzip2 \ + gnupg \ xz \ python3-virtualenv diff --git a/docker/tpl-ubuntu-clang-cuda.Dockerfile b/docker/tpl-ubuntu-clang-cuda.Dockerfile index b2764e0c..aea6266c 100644 --- a/docker/tpl-ubuntu-clang-cuda.Dockerfile +++ b/docker/tpl-ubuntu-clang-cuda.Dockerfile @@ -33,6 +33,8 @@ RUN ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime && \ unzip \ libmpfr-dev \ lbzip2 \ + bzip2 \ + gnupg \ virtualenv # Install clingo for Spack diff --git a/docker/tpl-ubuntu-clang.Dockerfile b/docker/tpl-ubuntu-clang.Dockerfile index d4bb74ce..780f229f 100644 --- a/docker/tpl-ubuntu-clang.Dockerfile +++ b/docker/tpl-ubuntu-clang.Dockerfile @@ -38,6 +38,8 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \ unzip \ libmpfr-dev \ lbzip2 \ + bzip2 \ + gnupg \ virtualenv # Install clingo for Spack diff --git a/docker/tpl-ubuntu-gcc.Dockerfile b/docker/tpl-ubuntu-gcc.Dockerfile index 5560da55..3c8ba685 100644 --- a/docker/tpl-ubuntu-gcc.Dockerfile +++ b/docker/tpl-ubuntu-gcc.Dockerfile @@ -63,6 +63,8 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=America/Los_Angeles \ unzip \ libmpfr-dev \ lbzip2 \ + bzip2 \ + gnupg \ virtualenv # Install clingo for Spack diff --git a/scripts/spack_configs/macOS/spack.yaml b/scripts/spack_configs/macOS/spack.yaml index 0b260f39..68a7ac6c 100644 --- a/scripts/spack_configs/macOS/spack.yaml +++ b/scripts/spack_configs/macOS/spack.yaml @@ -14,8 +14,8 @@ spack: # Include shared variants and versions include: - - ../scripts/spack_configs/defaults.yaml - - ../scripts/spack_configs/versions.yaml + - ../defaults.yaml + - ../versions.yaml compilers: - compiler: diff --git a/scripts/spack_configs/pangea-3/spack.yaml b/scripts/spack_configs/pangea-3/spack.yaml index eac7c0a6..acd9a7e4 100644 --- a/scripts/spack_configs/pangea-3/spack.yaml +++ b/scripts/spack_configs/pangea-3/spack.yaml @@ -26,8 +26,8 @@ spack: # Include shared variants and versions include: - - ../scripts/spack_configs/defaults.yaml - - ../scripts/spack_configs/versions.yaml + - ../defaults.yaml + - ../versions.yaml ############# # COMPILERS # diff --git a/scripts/spack_configs/pangea-4/spack.yaml b/scripts/spack_configs/pangea-4/spack.yaml index b3227ab9..b4461a27 100644 --- a/scripts/spack_configs/pangea-4/spack.yaml +++ b/scripts/spack_configs/pangea-4/spack.yaml @@ -25,8 +25,8 @@ spack: # Include shared variants and versions include: - - ../scripts/spack_configs/defaults.yaml - - ../scripts/spack_configs/versions.yaml + - ../defaults.yaml + - ../versions.yaml ############# # COMPILERS # From 48dcfabed70a984514fba192736ab325ab12694e Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 14 Aug 2025 08:23:48 -0700 Subject: [PATCH 4/7] Consolidate versions for maple and pine --- scripts/spack_configs/maple/spack.yaml | 39 ++++---------------------- scripts/spack_configs/pine/spack.yaml | 39 ++++---------------------- 2 files changed, 10 insertions(+), 68 deletions(-) diff --git a/scripts/spack_configs/maple/spack.yaml b/scripts/spack_configs/maple/spack.yaml index 04b98af5..82594316 100644 --- a/scripts/spack_configs/maple/spack.yaml +++ b/scripts/spack_configs/maple/spack.yaml @@ -22,6 +22,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../defaults.yaml + - ../versions.yaml + ############# # COMPILERS # ############# @@ -65,40 +70,6 @@ spack: mathpresso: buildable: false - #### - # spec of packages to build for - - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - # v2.32.0-33 - hypre: - require: "@git.21e5953ddc6daaa24699236108866afa597a415c" - # v2025.0.3 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - # master - 04/12/20 - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - # master - 04/26/20 - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - #### # spec of spack packages to reuse bison: diff --git a/scripts/spack_configs/pine/spack.yaml b/scripts/spack_configs/pine/spack.yaml index ab0d9113..bafae683 100644 --- a/scripts/spack_configs/pine/spack.yaml +++ b/scripts/spack_configs/pine/spack.yaml @@ -22,6 +22,11 @@ spack: # Regular TPLs do not need views view: false + # Include shared variants and versions + include: + - ../defaults.yaml + - ../versions.yaml + ############# # COMPILERS # ############# @@ -62,40 +67,6 @@ spack: lapack: buildable: false - #### - # spec of packages to build for - - # v0.6.2 - blt: - require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - # v2.32.0-33 - hypre: - require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c" - # v2025.0.3 - chai: - require: "@git.4b9060b18b9bec1167026cfb3132bd540c4bd56b=develop" - # v2025.0.3.0 - umpire: - require: "@git.1ed0669c57f041baa1f1070693991c3a7a43e7ee=develop" - # v2025.0.3.0 - raja: - require: "@git.1d70abf171474d331f1409908bdf1b1c3fe19222=develop" - # v2025.0.3.0 - camp: - require: "@git.ee0a3069a7ae72da8bcea63c06260fad34901d43=main" - # v2.12.0 - caliper: - require: "@git.287b7f3ad2d12f520aad04268d44f353cd05403c" - # v0.9.2 - conduit: - require: "@git.ad86e316ad56a75c099d30ca5ce75cff275b5924=develop" - # master - 04/12/20 - uncrustify: - require: "@git.401a4098bce9dcc47e024987403f2d59d9ba7bd2" - # master - 04/26/20 - superlu-dist: - require: "@git.0f6efc377df2440c235452d13d28d2c717f832a1" - #### # spec of spack packages to reuse gmp: From 73bfe40a73e6123763475084f44b94bed1684d5c Mon Sep 17 00:00:00 2001 From: Brian Han Date: Thu, 14 Aug 2025 08:30:03 -0700 Subject: [PATCH 5/7] Fix shared hypre version --- scripts/spack_configs/versions.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/spack_configs/versions.yaml b/scripts/spack_configs/versions.yaml index 3cc43562..37052ab1 100644 --- a/scripts/spack_configs/versions.yaml +++ b/scripts/spack_configs/versions.yaml @@ -18,9 +18,9 @@ packages: blt: require: "@git.9ff77344f0b2a6ee345e452bddd6bfd46cbbfa35=develop" - # master - 05/05/25 + # master - 06/27/25 hypre: - require: "@git.be52325a3ed8923fb93af348b1262ecfe44ab5d2" + require: "@git.907a2d07b64fe47bdde4540c54665c83ced83a2c" # v2025.0.3.0 chai: From 88283e959028df96e1a30629be0de927a83d79e1 Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Thu, 18 Sep 2025 19:33:45 -0700 Subject: [PATCH 6/7] update lc build scripts to change queue --- scripts/setupLC-TPL-uberenv.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/setupLC-TPL-uberenv.bash b/scripts/setupLC-TPL-uberenv.bash index 84f07263..9c3e3f7b 100755 --- a/scripts/setupLC-TPL-uberenv.bash +++ b/scripts/setupLC-TPL-uberenv.bash @@ -41,10 +41,10 @@ fi echo "Building all LC TPLs from $GEOS_BRANCH to be installed at $INSTALL_DIR..." -./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ & -./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12noAVX "%gcc@12noAVX +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ & -./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-13 "%gcc@13.3.1 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ & -./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-14 "%clang@14.0.6 +docs" "salloc -N 1 -n 1 -t 150 -A vortex" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs" "salloc -n 56 -p pdebug" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12noAVX "%gcc@12noAVX +docs" "salloc -n 56 -p pdebug" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-13 "%gcc@13.3.1 +docs" "salloc -n 56 -p pdebug" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-14 "%clang@14.0.6 +docs" "salloc -n 56 -p pdebug" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen gcc-8-cuda-11 "%gcc@8.3.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen gcc-12-cuda-12 "%gcc@12.2.1+cuda~uncrustify cuda_arch=70 ^cuda@12.2.2+allow-unsupported-compilers" "lalloc 1 -W 150" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen clang-13-cuda-11 "%clang@13.0.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ & From ad02660eeb6084bb080a8bcf61b32225cf9b01ea Mon Sep 17 00:00:00 2001 From: Randolph Settgast Date: Thu, 18 Sep 2025 21:26:28 -0700 Subject: [PATCH 7/7] update lc build scripts to change allocation size --- scripts/setupLC-TPL-uberenv.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/setupLC-TPL-uberenv.bash b/scripts/setupLC-TPL-uberenv.bash index 9c3e3f7b..bb0dc34f 100755 --- a/scripts/setupLC-TPL-uberenv.bash +++ b/scripts/setupLC-TPL-uberenv.bash @@ -41,10 +41,10 @@ fi echo "Building all LC TPLs from $GEOS_BRANCH to be installed at $INSTALL_DIR..." -./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs" "salloc -n 56 -p pdebug" $@ & -./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12noAVX "%gcc@12noAVX +docs" "salloc -n 56 -p pdebug" $@ & -./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-13 "%gcc@13.3.1 +docs" "salloc -n 56 -p pdebug" $@ & -./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-14 "%clang@14.0.6 +docs" "salloc -n 56 -p pdebug" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12 "%gcc@12.1.1 +docs" "salloc -n 112 --exclusive -p pdebug" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-12noAVX "%gcc@12noAVX +docs" "salloc -n 112 --exclusive -p pdebug" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane gcc-13 "%gcc@13.3.1 +docs" "salloc -n 112 --exclusive -p pdebug" $@ & +./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR dane clang-14 "%clang@14.0.6 +docs" "salloc -n 112 --exclusive -p pdebug" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen gcc-8-cuda-11 "%gcc@8.3.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen gcc-12-cuda-12 "%gcc@12.2.1+cuda~uncrustify cuda_arch=70 ^cuda@12.2.2+allow-unsupported-compilers" "lalloc 1 -W 150" $@ & ./scripts/setupLC-TPL-uberenv-helper.bash $INSTALL_DIR lassen clang-13-cuda-11 "%clang@13.0.1+cuda~uncrustify cuda_arch=70 ^cuda@11.8.0+allow-unsupported-compilers" "lalloc 1 -W 150" $@ &