From 491b30fa8922bf2e0bbbb4774227095a6c1bf3b1 Mon Sep 17 00:00:00 2001 From: Stephen Herbener <32968781+srherbener@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:11:17 -0700 Subject: [PATCH 1/2] Moved ectrans 1.5.0 specs to version 1.2.0 (#1430) This PR updates all of the places in the configuration, including containers, to move ectrans back to version 1.2.0. This is being done due to an issue (#1417) where ectrans@1.2.0 will compile successfully with the Intel LLVM based Fortran compiler (ifx) but ectrans@1.5.0 will not compile with ifx. --- configs/common/packages.yaml | 2 +- configs/containers/specs/jedi-ci.yaml | 2 +- configs/sites/tier1/acorn/packages_intel.yaml | 2 +- configs/sites/tier1/aws-pcluster/packages_intel.yaml | 2 +- configs/sites/tier1/gaea-c5/packages.yaml | 2 +- configs/sites/tier1/gaea-c6/packages.yaml | 2 +- configs/sites/tier1/hera/packages_intel.yaml | 2 +- configs/sites/tier1/hercules/packages_intel.yaml | 2 +- configs/sites/tier1/nautilus/packages_aocc.yaml | 2 +- configs/sites/tier1/nautilus/packages_gcc.yaml | 2 +- configs/sites/tier1/noaa-aws/packages_intel.yaml | 2 +- configs/sites/tier1/noaa-azure/packages_intel.yaml | 2 +- configs/sites/tier1/noaa-gcloud/packages_intel.yaml | 2 +- configs/sites/tier1/orion/packages_intel.yaml | 2 +- configs/sites/tier1/s4/packages.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index 13fdb34c2..f8001536b 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -55,7 +55,7 @@ packages: require: '@0.40.0 +fckit +trans +tesselation +fftw' ectrans: require: - - '@1.5.0' + - '@1.2.0' eigen: require: '@3.4.0' # Attention - when updating the version also check the common modules.yaml diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml index 6f93c5432..db7c9501d 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -15,7 +15,7 @@ eckit@1.28.3, ecmwf-atlas@0.40.0 +fckit +trans +tesselation +fftw, fiat@1.4.1, - ectrans@1.5.0 +fftw, + ectrans@1.2.0 +fftw, eigen@3.4.0, fckit@0.13.2, fms@2024.02, diff --git a/configs/sites/tier1/acorn/packages_intel.yaml b/configs/sites/tier1/acorn/packages_intel.yaml index a55cad6ad..b9cfc096c 100644 --- a/configs/sites/tier1/acorn/packages_intel.yaml +++ b/configs/sites/tier1/acorn/packages_intel.yaml @@ -25,7 +25,7 @@ # DH* Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/aws-pcluster/packages_intel.yaml b/configs/sites/tier1/aws-pcluster/packages_intel.yaml index 7a7fec11c..7c04e9b9a 100644 --- a/configs/sites/tier1/aws-pcluster/packages_intel.yaml +++ b/configs/sites/tier1/aws-pcluster/packages_intel.yaml @@ -25,7 +25,7 @@ packages: # DH* Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/gaea-c5/packages.yaml b/configs/sites/tier1/gaea-c5/packages.yaml index 9d59b8bbd..7bbc7f43f 100644 --- a/configs/sites/tier1/gaea-c5/packages.yaml +++ b/configs/sites/tier1/gaea-c5/packages.yaml @@ -29,7 +29,7 @@ packages: # DH* Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/gaea-c6/packages.yaml b/configs/sites/tier1/gaea-c6/packages.yaml index 224b56831..7e8797f4b 100644 --- a/configs/sites/tier1/gaea-c6/packages.yaml +++ b/configs/sites/tier1/gaea-c6/packages.yaml @@ -28,7 +28,7 @@ packages: # DH* Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/hera/packages_intel.yaml b/configs/sites/tier1/hera/packages_intel.yaml index 514424a99..ad7ec6512 100644 --- a/configs/sites/tier1/hera/packages_intel.yaml +++ b/configs/sites/tier1/hera/packages_intel.yaml @@ -24,7 +24,7 @@ packages: # DH* Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/hercules/packages_intel.yaml b/configs/sites/tier1/hercules/packages_intel.yaml index d7c7dbe21..3642bdc7b 100644 --- a/configs/sites/tier1/hercules/packages_intel.yaml +++ b/configs/sites/tier1/hercules/packages_intel.yaml @@ -24,7 +24,7 @@ packages: # Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/nautilus/packages_aocc.yaml b/configs/sites/tier1/nautilus/packages_aocc.yaml index 65092508b..380d51b6e 100644 --- a/configs/sites/tier1/nautilus/packages_aocc.yaml +++ b/configs/sites/tier1/nautilus/packages_aocc.yaml @@ -26,7 +26,7 @@ packages: buildable: False ectrans: require:: - - '@1.5.0 +mkl ~fftw' + - '@1.2.0 +mkl ~fftw' gsibec: require:: - '@1.2.1 +mkl' diff --git a/configs/sites/tier1/nautilus/packages_gcc.yaml b/configs/sites/tier1/nautilus/packages_gcc.yaml index c97a48ba8..2e47c9e0e 100644 --- a/configs/sites/tier1/nautilus/packages_gcc.yaml +++ b/configs/sites/tier1/nautilus/packages_gcc.yaml @@ -25,7 +25,7 @@ packages: buildable: False ectrans: require:: - - '@1.5.0 +mkl ~fftw' + - '@1.2.0 +mkl ~fftw' gsibec: require:: - '@1.2.1 +mkl' diff --git a/configs/sites/tier1/noaa-aws/packages_intel.yaml b/configs/sites/tier1/noaa-aws/packages_intel.yaml index 665c8aaa0..0700f2c4b 100644 --- a/configs/sites/tier1/noaa-aws/packages_intel.yaml +++ b/configs/sites/tier1/noaa-aws/packages_intel.yaml @@ -24,7 +24,7 @@ packages: # DH* Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/noaa-azure/packages_intel.yaml b/configs/sites/tier1/noaa-azure/packages_intel.yaml index 665c8aaa0..0700f2c4b 100644 --- a/configs/sites/tier1/noaa-azure/packages_intel.yaml +++ b/configs/sites/tier1/noaa-azure/packages_intel.yaml @@ -24,7 +24,7 @@ packages: # DH* Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/noaa-gcloud/packages_intel.yaml b/configs/sites/tier1/noaa-gcloud/packages_intel.yaml index 665c8aaa0..0700f2c4b 100644 --- a/configs/sites/tier1/noaa-gcloud/packages_intel.yaml +++ b/configs/sites/tier1/noaa-gcloud/packages_intel.yaml @@ -24,7 +24,7 @@ packages: # DH* Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/orion/packages_intel.yaml b/configs/sites/tier1/orion/packages_intel.yaml index d7c7dbe21..3642bdc7b 100644 --- a/configs/sites/tier1/orion/packages_intel.yaml +++ b/configs/sites/tier1/orion/packages_intel.yaml @@ -24,7 +24,7 @@ packages: # Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' diff --git a/configs/sites/tier1/s4/packages.yaml b/configs/sites/tier1/s4/packages.yaml index 08acf079c..1981196d2 100644 --- a/configs/sites/tier1/s4/packages.yaml +++ b/configs/sites/tier1/s4/packages.yaml @@ -31,7 +31,7 @@ packages: # Remove this section to switch to intel-oneapi-mkl ectrans: require:: - - '@1.5.0 ~mkl +fftw' + - '@1.2.0 ~mkl +fftw' gsibec: require:: - '@1.2.1 ~mkl' From 217347478e4cc17fc0c702a357f601cc0ef90d2b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 20 Dec 2024 16:44:53 -0700 Subject: [PATCH 2/2] Use external grep package in GitHub actions, new site config instructions, and pre-configured tier-1 sites (#1419) External grep in new site configs (documentation), CI, Containers, pre-configured sites (at least tier 1, except acorn - will be added later). --- .github/workflows/macos-ci-aarch64.yaml | 1 + .github/workflows/ubuntu-ci-x86_64-gnu.yaml | 1 + .github/workflows/ubuntu-ci-x86_64-intel.yaml | 1 + .../ubuntu-ci-x86_64-oneapi-ifx.yaml | 1 + .../workflows/ubuntu-ci-x86_64-oneapi.yaml | 1 + .../containers/docker-ubuntu-clang-mpich.yaml | 5 + .../containers/docker-ubuntu-gcc-openmpi.yaml | 5 + .../containers/docker-ubuntu-intel-impi.yaml | 5 + configs/sites/tier1/atlantis/packages.yaml | 102 +++++++++--------- .../sites/tier1/aws-pcluster/packages.yaml | 4 + configs/sites/tier1/blueback/packages.yaml | 4 + configs/sites/tier1/derecho/packages.yaml | 4 + .../sites/tier1/discover-scu16/packages.yaml | 4 + .../sites/tier1/discover-scu17/packages.yaml | 4 + configs/sites/tier1/gaea-c5/packages.yaml | 4 + configs/sites/tier1/gaea-c6/packages.yaml | 4 + configs/sites/tier1/hera/packages.yaml | 4 + configs/sites/tier1/hercules/packages.yaml | 4 + configs/sites/tier1/jet/packages.yaml | 4 + configs/sites/tier1/narwhal/packages.yaml | 4 + configs/sites/tier1/nautilus/packages.yaml | 4 + configs/sites/tier1/navy-aws/packages.yaml | 4 + configs/sites/tier1/noaa-aws/packages.yaml | 4 + configs/sites/tier1/noaa-azure/packages.yaml | 4 + configs/sites/tier1/noaa-gcloud/packages.yaml | 4 + configs/sites/tier1/orion/packages.yaml | 4 + configs/sites/tier1/s4/packages.yaml | 4 + configs/sites/tier2/blackpearl/packages.yaml | 4 + configs/sites/tier2/bounty/packages.yaml | 4 + configs/sites/tier2/casper/packages.yaml | 4 + doc/source/NewSiteConfigs.rst | 4 + spack | 2 +- 32 files changed, 162 insertions(+), 50 deletions(-) diff --git a/.github/workflows/macos-ci-aarch64.yaml b/.github/workflows/macos-ci-aarch64.yaml index cb4c6c219..22366b897 100644 --- a/.github/workflows/macos-ci-aarch64.yaml +++ b/.github/workflows/macos-ci-aarch64.yaml @@ -69,6 +69,7 @@ jobs: spack external find --scope system \ --exclude bison --exclude openssl \ --exclude curl --exclude python + spack external find --scope system grep spack external find --scope system perl spack external find --scope system libiconv spack external find --scope system wget diff --git a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml index c1d29712d..a8f295b7c 100644 --- a/.github/workflows/ubuntu-ci-x86_64-gnu.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-gnu.yaml @@ -69,6 +69,7 @@ jobs: spack external find --scope system \ --exclude bison --exclude openssl \ --exclude curl --exclude python + spack external find --scope system grep spack external find --scope system sed spack external find --scope system perl spack external find --scope system wget diff --git a/.github/workflows/ubuntu-ci-x86_64-intel.yaml b/.github/workflows/ubuntu-ci-x86_64-intel.yaml index f391ce901..708efb581 100644 --- a/.github/workflows/ubuntu-ci-x86_64-intel.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-intel.yaml @@ -60,6 +60,7 @@ jobs: spack external find --scope system \ --exclude bison --exclude openssl \ --exclude curl --exclude python + spack external find --scope system grep spack external find --scope system sed spack external find --scope system perl spack external find --scope system wget diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml index 0397b0e51..1eca69ef5 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml @@ -61,6 +61,7 @@ jobs: --exclude bison --exclude openssl \ --exclude curl --exclude python \ --exclude gmake + spack external find --scope system grep spack external find --scope system sed spack external find --scope system perl spack external find --scope system wget diff --git a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml index 976813438..7c11fbb2e 100644 --- a/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml +++ b/.github/workflows/ubuntu-ci-x86_64-oneapi.yaml @@ -61,6 +61,7 @@ jobs: --exclude bison --exclude openssl \ --exclude curl --exclude python \ --exclude gmake + spack external find --scope system grep spack external find --scope system sed spack external find --scope system perl spack external find --scope system wget diff --git a/configs/containers/docker-ubuntu-clang-mpich.yaml b/configs/containers/docker-ubuntu-clang-mpich.yaml index 67a986d3d..9bcc1c866 100644 --- a/configs/containers/docker-ubuntu-clang-mpich.yaml +++ b/configs/containers/docker-ubuntu-clang-mpich.yaml @@ -74,6 +74,11 @@ spack: externals: - spec: git-lfs@3.0.2 prefix: /usr + grep: + buildable: false + externals: + - spec: grep@3.7 + prefix: /usr mysql: buildable: false externals: diff --git a/configs/containers/docker-ubuntu-gcc-openmpi.yaml b/configs/containers/docker-ubuntu-gcc-openmpi.yaml index 43b5b2fb8..85827df7c 100644 --- a/configs/containers/docker-ubuntu-gcc-openmpi.yaml +++ b/configs/containers/docker-ubuntu-gcc-openmpi.yaml @@ -55,6 +55,11 @@ spack: externals: - spec: git-lfs@3.0.2 prefix: /usr + grep: + buildable: false + externals: + - spec: grep@3.7 + prefix: /usr mysql: buildable: false externals: diff --git a/configs/containers/docker-ubuntu-intel-impi.yaml b/configs/containers/docker-ubuntu-intel-impi.yaml index 6dd5ad15d..c7a1c5e2c 100644 --- a/configs/containers/docker-ubuntu-intel-impi.yaml +++ b/configs/containers/docker-ubuntu-intel-impi.yaml @@ -65,6 +65,11 @@ spack: externals: - spec: git-lfs@3.0.2 prefix: /usr + grep: + buildable: false + externals: + - spec: grep@3.7 + prefix: /usr mysql: buildable: false externals: diff --git a/configs/sites/tier1/atlantis/packages.yaml b/configs/sites/tier1/atlantis/packages.yaml index dc2c16aaf..7a6057d1d 100644 --- a/configs/sites/tier1/atlantis/packages.yaml +++ b/configs/sites/tier1/atlantis/packages.yaml @@ -1,99 +1,103 @@ packages: - curl: - externals: - - spec: curl@7.61.1 - prefix: /usr - wget: - externals: - - spec: wget@1.19.5 - prefix: /usr - # Can't use with py-xnrl - #perl: - # externals: - # - spec: perl@5.26.3~cpanm+shared+threads - # prefix: /usr - gmake: + autoconf: externals: - - spec: gmake@4.2.1 + - spec: autoconf@2.69 prefix: /usr automake: externals: - spec: automake@1.16.1 prefix: /usr + binutils: + externals: + - spec: binutils@2.30.117 + prefix: /usr bison: externals: - spec: bison@3.0.4 prefix: /usr - groff: + coreutils: externals: - - spec: groff@1.22.3 + - spec: coreutils@8.30 prefix: /usr - pkgconf: + curl: externals: - - spec: pkgconf@1.4.2 + - spec: curl@7.61.1 prefix: /usr - subversion: + diffutils: externals: - - spec: subversion@1.10.2 + - spec: diffutils@3.6 prefix: /usr - autoconf: + findutils: externals: - - spec: autoconf@2.69 + - spec: findutils@4.6.0 prefix: /usr - binutils: + flex: externals: - - spec: binutils@2.30.117 + - spec: flex@2.6.1+lex + prefix: /usr + gawk: + externals: + - spec: gawk@4.2.1 prefix: /usr + git: + externals: + - spec: git@2.39.2+tcltk + prefix: /software8/depot/git-2.39.2 git-lfs: externals: - spec: git-lfs@3.3.0 prefix: /software8/depot/git-2.39.2 - m4: + gmake: externals: - - spec: m4@1.4.18 + - spec: gmake@4.2.1 prefix: /usr - tar: + grep: externals: - - spec: tar@1.30 + - spec: grep@3.1 prefix: /usr - coreutils: + groff: externals: - - spec: coreutils@8.30 + - spec: groff@1.22.3 prefix: /usr - texinfo: + libtool: externals: - - spec: texinfo@6.5 + - spec: libtool@2.4.6 prefix: /usr - git: - externals: - - spec: git@2.39.2+tcltk - prefix: /software8/depot/git-2.39.2 - diffutils: + m4: externals: - - spec: diffutils@3.6 + - spec: m4@1.4.18 prefix: /usr openssh: externals: - spec: openssh@8.0p1 prefix: /usr - flex: - externals: - - spec: flex@2.6.1+lex - prefix: /usr # Can no longer use, issues with py-cryptography #openssl: # externals: # - spec: openssl@1.1.1k # prefix: /usr - gawk: + # Can't use with py-xnrl + #perl: + # externals: + # - spec: perl@5.26.3~cpanm+shared+threads + # prefix: /usr + pkgconf: externals: - - spec: gawk@4.2.1 + - spec: pkgconf@1.4.2 prefix: /usr - libtool: + subversion: externals: - - spec: libtool@2.4.6 + - spec: subversion@1.10.2 prefix: /usr - findutils: + tar: externals: - - spec: findutils@4.6.0 + - spec: tar@1.30 + prefix: /usr + texinfo: + externals: + - spec: texinfo@6.5 + prefix: /usr + wget: + externals: + - spec: wget@1.19.5 prefix: /usr diff --git a/configs/sites/tier1/aws-pcluster/packages.yaml b/configs/sites/tier1/aws-pcluster/packages.yaml index 6158d0119..58c2a1ea6 100644 --- a/configs/sites/tier1/aws-pcluster/packages.yaml +++ b/configs/sites/tier1/aws-pcluster/packages.yaml @@ -27,6 +27,10 @@ packages: externals: - spec: gawk@5.1.0 prefix: /usr + grep: + externals: + - spec: grep@3.7 + prefix: /usr tar: externals: - spec: tar@1.34 diff --git a/configs/sites/tier1/blueback/packages.yaml b/configs/sites/tier1/blueback/packages.yaml index bb4d39c4d..16b17fe6b 100644 --- a/configs/sites/tier1/blueback/packages.yaml +++ b/configs/sites/tier1/blueback/packages.yaml @@ -59,6 +59,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/configs/sites/tier1/derecho/packages.yaml b/configs/sites/tier1/derecho/packages.yaml index f9fac0663..ad9e5f303 100644 --- a/configs/sites/tier1/derecho/packages.yaml +++ b/configs/sites/tier1/derecho/packages.yaml @@ -64,6 +64,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/configs/sites/tier1/discover-scu16/packages.yaml b/configs/sites/tier1/discover-scu16/packages.yaml index d47b8cbaa..217347278 100644 --- a/configs/sites/tier1/discover-scu16/packages.yaml +++ b/configs/sites/tier1/discover-scu16/packages.yaml @@ -82,6 +82,10 @@ packages: externals: - spec: gmake@4.0 prefix: /usr + grep: + externals: + - spec: grep@2.16 + prefix: /usr groff: externals: - spec: groff@1.22.2 diff --git a/configs/sites/tier1/discover-scu17/packages.yaml b/configs/sites/tier1/discover-scu17/packages.yaml index 906a2af31..502f70bad 100644 --- a/configs/sites/tier1/discover-scu17/packages.yaml +++ b/configs/sites/tier1/discover-scu17/packages.yaml @@ -83,6 +83,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/configs/sites/tier1/gaea-c5/packages.yaml b/configs/sites/tier1/gaea-c5/packages.yaml index 7bbc7f43f..c16ab31d0 100644 --- a/configs/sites/tier1/gaea-c5/packages.yaml +++ b/configs/sites/tier1/gaea-c5/packages.yaml @@ -119,6 +119,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.3 diff --git a/configs/sites/tier1/gaea-c6/packages.yaml b/configs/sites/tier1/gaea-c6/packages.yaml index 7e8797f4b..2de3b775d 100644 --- a/configs/sites/tier1/gaea-c6/packages.yaml +++ b/configs/sites/tier1/gaea-c6/packages.yaml @@ -108,6 +108,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/configs/sites/tier1/hera/packages.yaml b/configs/sites/tier1/hera/packages.yaml index 36a0a3f68..ac6cad40e 100644 --- a/configs/sites/tier1/hera/packages.yaml +++ b/configs/sites/tier1/hera/packages.yaml @@ -62,6 +62,10 @@ packages: externals: - spec: gmake@3.82 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.2 diff --git a/configs/sites/tier1/hercules/packages.yaml b/configs/sites/tier1/hercules/packages.yaml index bb6e6222c..2bfb13269 100644 --- a/configs/sites/tier1/hercules/packages.yaml +++ b/configs/sites/tier1/hercules/packages.yaml @@ -49,6 +49,10 @@ packages: externals: - spec: gmake@4.3 prefix: /usr + grep: + externals: + - spec: grep@3.6 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/configs/sites/tier1/jet/packages.yaml b/configs/sites/tier1/jet/packages.yaml index fa6a0d123..4867089fe 100644 --- a/configs/sites/tier1/jet/packages.yaml +++ b/configs/sites/tier1/jet/packages.yaml @@ -70,6 +70,10 @@ packages: externals: - spec: go@1.16.13 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.2 diff --git a/configs/sites/tier1/narwhal/packages.yaml b/configs/sites/tier1/narwhal/packages.yaml index 49fad5ebe..fd708d95b 100644 --- a/configs/sites/tier1/narwhal/packages.yaml +++ b/configs/sites/tier1/narwhal/packages.yaml @@ -45,6 +45,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.3 diff --git a/configs/sites/tier1/nautilus/packages.yaml b/configs/sites/tier1/nautilus/packages.yaml index 2a07d88c3..86dfc7e0b 100644 --- a/configs/sites/tier1/nautilus/packages.yaml +++ b/configs/sites/tier1/nautilus/packages.yaml @@ -54,6 +54,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.3 diff --git a/configs/sites/tier1/navy-aws/packages.yaml b/configs/sites/tier1/navy-aws/packages.yaml index 7ac471cdf..ba08841e1 100644 --- a/configs/sites/tier1/navy-aws/packages.yaml +++ b/configs/sites/tier1/navy-aws/packages.yaml @@ -65,6 +65,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.3 diff --git a/configs/sites/tier1/noaa-aws/packages.yaml b/configs/sites/tier1/noaa-aws/packages.yaml index dda1f369b..218709502 100644 --- a/configs/sites/tier1/noaa-aws/packages.yaml +++ b/configs/sites/tier1/noaa-aws/packages.yaml @@ -43,6 +43,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.21 diff --git a/configs/sites/tier1/noaa-azure/packages.yaml b/configs/sites/tier1/noaa-azure/packages.yaml index 397bc780b..4102d35db 100644 --- a/configs/sites/tier1/noaa-azure/packages.yaml +++ b/configs/sites/tier1/noaa-azure/packages.yaml @@ -43,6 +43,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr hwloc: externals: - spec: hwloc@2.2.0 diff --git a/configs/sites/tier1/noaa-gcloud/packages.yaml b/configs/sites/tier1/noaa-gcloud/packages.yaml index 397bc780b..4102d35db 100644 --- a/configs/sites/tier1/noaa-gcloud/packages.yaml +++ b/configs/sites/tier1/noaa-gcloud/packages.yaml @@ -43,6 +43,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr hwloc: externals: - spec: hwloc@2.2.0 diff --git a/configs/sites/tier1/orion/packages.yaml b/configs/sites/tier1/orion/packages.yaml index bef7849a9..cd75cdfe2 100644 --- a/configs/sites/tier1/orion/packages.yaml +++ b/configs/sites/tier1/orion/packages.yaml @@ -59,6 +59,10 @@ packages: externals: - spec: gmake@4.3 prefix: /usr + grep: + externals: + - spec: grep@3.6 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/configs/sites/tier1/s4/packages.yaml b/configs/sites/tier1/s4/packages.yaml index 1981196d2..eb7bb70c8 100644 --- a/configs/sites/tier1/s4/packages.yaml +++ b/configs/sites/tier1/s4/packages.yaml @@ -129,6 +129,10 @@ packages: externals: - spec: go@1.21.13 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.3 diff --git a/configs/sites/tier2/blackpearl/packages.yaml b/configs/sites/tier2/blackpearl/packages.yaml index 9f1e51f9f..5613edcd8 100644 --- a/configs/sites/tier2/blackpearl/packages.yaml +++ b/configs/sites/tier2/blackpearl/packages.yaml @@ -51,6 +51,10 @@ packages: # externals: # - spec: gmake@4.3 # prefix: /usr + grep: + externals: + - spec: grep@3.6 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/configs/sites/tier2/bounty/packages.yaml b/configs/sites/tier2/bounty/packages.yaml index 768bfea64..a9c812bf7 100644 --- a/configs/sites/tier2/bounty/packages.yaml +++ b/configs/sites/tier2/bounty/packages.yaml @@ -51,6 +51,10 @@ packages: externals: - spec: gmake@4.3 prefix: /usr + grep: + externals: + - spec: grep@3.6 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/configs/sites/tier2/casper/packages.yaml b/configs/sites/tier2/casper/packages.yaml index b5887596f..8666e071b 100644 --- a/configs/sites/tier2/casper/packages.yaml +++ b/configs/sites/tier2/casper/packages.yaml @@ -111,6 +111,10 @@ packages: externals: - spec: gmake@4.2.1 prefix: /usr + grep: + externals: + - spec: grep@3.1 + prefix: /usr groff: externals: - spec: groff@1.22.4 diff --git a/doc/source/NewSiteConfigs.rst b/doc/source/NewSiteConfigs.rst index 125ddfbee..74d5107e0 100644 --- a/doc/source/NewSiteConfigs.rst +++ b/doc/source/NewSiteConfigs.rst @@ -245,6 +245,7 @@ Remember to activate the ``lua`` module environment and have MacTeX in your sear --exclude bison --exclude openssl \ --exclude python --exclude gettext \ --exclude m4 + spack external find --scope system grep spack external find --scope system perl spack external find --scope system wget @@ -536,6 +537,9 @@ It is recommended to increase the stacksize limit by using ``ulimit -S -s unlimi --exclude cmake \ --exclude curl --exclude openssl \ --exclude openssh --exclude python + spack external find --scope system grep + spack external find --scope system sed + spack external find --scope system perl spack external find --scope system wget # Note - only needed for running JCSDA's diff --git a/spack b/spack index c0dc3572e..033e70052 160000 --- a/spack +++ b/spack @@ -1 +1 @@ -Subproject commit c0dc3572e4ce215ab4810ef22ea6082eba07e4ef +Subproject commit 033e70052dc72dc4858bfee2622780b83952cdc5