Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/container_builds_broken_after_1384
Browse files Browse the repository at this point in the history
  • Loading branch information
@climbfuji
climbfuji authored Dec 21, 2024
2 parents b211b18 + 2173474 commit 888f9ac
Show file tree
Hide file tree
Showing 44 changed files with 177 additions and 65 deletions.
1 change: 1 addition & 0 deletions .github/workflows/macos-ci-aarch64.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ubuntu-ci-x86_64-gnu.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ubuntu-ci-x86_64-intel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ubuntu-ci-x86_64-oneapi-ifx.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ubuntu-ci-x86_64-oneapi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion configs/common/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions configs/containers/docker-ubuntu-clang-mpich.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@ spack:
externals:
- spec: [email protected]
prefix: /usr
grep:
buildable: false
externals:
- spec: [email protected]
prefix: /usr
mysql:
buildable: false
externals:
Expand Down
5 changes: 5 additions & 0 deletions configs/containers/docker-ubuntu-gcc-openmpi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ spack:
externals:
- spec: [email protected]
prefix: /usr
grep:
buildable: false
externals:
- spec: [email protected]
prefix: /usr
mysql:
buildable: false
externals:
Expand Down
5 changes: 5 additions & 0 deletions configs/containers/docker-ubuntu-intel-impi.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ spack:
externals:
- spec: [email protected]
prefix: /usr
grep:
buildable: false
externals:
- spec: [email protected]
prefix: /usr
mysql:
buildable: false
externals:
Expand Down
2 changes: 1 addition & 1 deletion configs/containers/specs/jedi-ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
[email protected],
[email protected] +fckit +trans +tesselation +fftw,
[email protected],
ectrans@1.5.0 +fftw,
ectrans@1.2.0 +fftw,
[email protected],
[email protected],
[email protected],
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/tier1/acorn/packages_intel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
102 changes: 53 additions & 49 deletions configs/sites/tier1/atlantis/packages.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,99 +1,103 @@
packages:
curl:
externals:
- spec: [email protected]
prefix: /usr
wget:
externals:
- spec: [email protected]
prefix: /usr
# Can't use with py-xnrl
#perl:
# externals:
# - spec: [email protected]~cpanm+shared+threads
# prefix: /usr
gmake:
autoconf:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
automake:
externals:
- spec: [email protected]
prefix: /usr
binutils:
externals:
- spec: [email protected]
prefix: /usr
bison:
externals:
- spec: [email protected]
prefix: /usr
groff:
coreutils:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
pkgconf:
curl:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
subversion:
diffutils:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
autoconf:
findutils:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
binutils:
flex:
externals:
- spec: [email protected]
- spec: [email protected]+lex
prefix: /usr
gawk:
externals:
- spec: [email protected]
prefix: /usr
git:
externals:
- spec: [email protected]+tcltk
prefix: /software8/depot/git-2.39.2
git-lfs:
externals:
- spec: [email protected]
prefix: /software8/depot/git-2.39.2
m4:
gmake:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
tar:
grep:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
coreutils:
groff:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
texinfo:
libtool:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
git:
externals:
- spec: [email protected]+tcltk
prefix: /software8/depot/git-2.39.2
diffutils:
m4:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
openssh:
externals:
- spec: [email protected]
prefix: /usr
flex:
externals:
- spec: [email protected]+lex
prefix: /usr
# Can no longer use, issues with py-cryptography
#openssl:
# externals:
# - spec: [email protected]
# prefix: /usr
gawk:
# Can't use with py-xnrl
#perl:
# externals:
# - spec: [email protected]~cpanm+shared+threads
# prefix: /usr
pkgconf:
externals:
- spec: gawk@4.2.1
- spec: pkgconf@1.4.2
prefix: /usr
libtool:
subversion:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
findutils:
tar:
externals:
- spec: [email protected]
- spec: [email protected]
prefix: /usr
texinfo:
externals:
- spec: [email protected]
prefix: /usr
wget:
externals:
- spec: [email protected]
prefix: /usr
4 changes: 4 additions & 0 deletions configs/sites/tier1/aws-pcluster/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
tar:
externals:
- spec: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/tier1/aws-pcluster/packages_intel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 4 additions & 0 deletions configs/sites/tier1/blueback/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
groff:
externals:
- spec: [email protected]
Expand Down
4 changes: 4 additions & 0 deletions configs/sites/tier1/derecho/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
groff:
externals:
- spec: [email protected]
Expand Down
4 changes: 4 additions & 0 deletions configs/sites/tier1/discover-scu16/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
groff:
externals:
- spec: [email protected]
Expand Down
4 changes: 4 additions & 0 deletions configs/sites/tier1/discover-scu17/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
groff:
externals:
- spec: [email protected]
Expand Down
6 changes: 5 additions & 1 deletion configs/sites/tier1/gaea-c5/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -119,6 +119,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
groff:
externals:
- spec: [email protected]
Expand Down
6 changes: 5 additions & 1 deletion configs/sites/tier1/gaea-c6/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -108,6 +108,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
groff:
externals:
- spec: [email protected]
Expand Down
4 changes: 4 additions & 0 deletions configs/sites/tier1/hera/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
groff:
externals:
- spec: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/tier1/hera/packages_intel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 4 additions & 0 deletions configs/sites/tier1/hercules/packages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
grep:
externals:
- spec: [email protected]
prefix: /usr
groff:
externals:
- spec: [email protected]
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/tier1/hercules/packages_intel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading

0 comments on commit 888f9ac

Please sign in to comment.