Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update new machine (Gaea-C6) and upgraded machine (Gaea-C5) #1372

Merged
merged 1 commit into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions configs/common/modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ modules:
'TOCGRIB': '{prefix}/bin/tocgrib'
'TOCGRIB2': '{prefix}/bin/tocgrib2'
'TOCGRIB2SUPER': '{prefix}/bin/tocgrib2super'
'WGRIB2': '{prefix}/bin/wgrib2'
'WGRIB': '{prefix}/bin/wgrib'
landsfcutil:
environment:
set:
Expand Down Expand Up @@ -451,7 +451,7 @@ modules:
'TOCGRIB': '{prefix}/bin/tocgrib'
'TOCGRIB2': '{prefix}/bin/tocgrib2'
'TOCGRIB2SUPER': '{prefix}/bin/tocgrib2super'
'WGRIB2': '{prefix}/bin/wgrib2'
'WGRIB': '{prefix}/bin/wgrib'
landsfcutil:
environment:
set:
Expand Down
21 changes: 0 additions & 21 deletions configs/sites/gaea-c4/compilers.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions configs/sites/gaea-c4/config.yaml

This file was deleted.

18 changes: 9 additions & 9 deletions configs/sites/gaea-c5/compilers.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
compilers:
- compiler:
spec: intel@2023.1.0
spec: intel@2023.2.0
paths:
cc: cc
cxx: CC
f77: ftn
fc: ftn
flags: {}
operating_system: sles15
modules:
- PrgEnv-intel/8.3.3
- intel-classic/2023.1.0
- craype/2.7.20
- PrgEnv-intel/8.5.0
- intel-classic/2023.2.0
- craype/2.7.30
- libfabric/1.20.1
flags:
cflags: "-gcc-name=/usr/bin/gcc-12"
cxxflags: "-gxx-name=/usr/bin/g++-12 -gcc-name=/usr/bin/gcc-12 -static-libstdc++"
fflags: "-gcc-name=/usr/bin/gcc-12"
environment:
prepend_path:
PATH: '/opt/cray/pe/gcc/10.3.0/snos/bin'
CPATH: '/opt/cray/pe/gcc/10.3.0/snos/include'
LD_LIBRARY_PATH: '/opt/cray/pe/gcc/10.3.0/snos/lib:/opt/cray/pe/gcc/10.3.0/snos/lib64'
set:
# OpenSUSE on Gaea C5 sets CONFIG_SITE so
# Automake-based builds are installed in lib64
Expand Down
74 changes: 31 additions & 43 deletions configs/sites/gaea-c5/packages.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
packages:
all:
compiler:: [intel@2023.1.0]
compiler:: [intel@2023.2.0]
providers:
mpi:: [[email protected]]
mpi:: [[email protected]]
blas:: [openblas]
fftw-api:: [fftw]
lapack:: [openblas]

### MPI, Python, MKL
mpi:
buildable: False
cray-mpich:
externals:
- spec: [email protected]%[email protected]~wrappers
prefix: /opt/cray/pe/mpich/8.1.25/ofi/intel/19.0
- spec: [email protected]%[email protected]~wrappers
modules:
- craype-network-ofi
- cray-mpich/8.1.25
- cray-mpich/8.1.28

### Modification of common packages
# Until problems with OS openssh and spack openssl are resolved,
Expand All @@ -34,29 +38,19 @@ packages:
prefix: /usr
binutils:
externals:
- spec: binutils@2.37.20211103
- spec: binutils@2.41
prefix: /usr
# Don't use, it's missing the headers
#bzip2:
# externals:
# - spec: [email protected]
# prefix: /usr
cmake:
buildable: false
externals:
- spec: [email protected]
modules: [cmake/3.23.1]
coreutils:
externals:
- spec: [email protected]
prefix: /usr
cpio:
externals:
- spec: cpio@2.12
- spec: cpio@2.13
prefix: /usr
curl:
externals:
- spec: curl@7.66.0+gssapi+ldap+nghttp2
- spec: curl@8.0.1+gssapi+ldap+nghttp2
prefix: /usr
diffutils:
externals:
Expand All @@ -70,7 +64,7 @@ packages:
buildable: False
externals:
- spec: [email protected]+ui+static_boost
prefix: /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/ecflow-5.8.4
prefix: /ncrc/proj/epic/spack-stack/ecflow-5.8.4
modules: [ecflow/5.8.4]
file:
externals:
Expand Down Expand Up @@ -112,42 +106,36 @@ packages:
prefix: /usr
groff:
externals:
- spec: [email protected].3
- spec: [email protected].4
prefix: /usr
hwloc:
externals:
- spec: hwloc@2.6.0a1
- spec: hwloc@2.9.0
prefix: /usr
# This package is currently incomplete (no headers), but still works
krb5:
externals:
- spec: [email protected]
#prefix: /usr/lib/mit
- spec: [email protected]
prefix: /usr
libfuse:
externals:
- spec: [email protected]
prefix: /usr
- spec: libfuse@3.6.1
- spec: libfuse@3.10.5
prefix: /usr
libtirpc:
variants: ~gssapi
libtool:
externals:
- spec: [email protected]
prefix: /usr
# This package is currently incomplete (no headers), but still works
libxaw:
externals:
- spec: [email protected]
prefix: /usr
libxml2:
externals:
- spec: libxml2@2.9.7
- spec: libxml2@2.10.3
prefix: /usr
# This package is currently incomplete (no headers) and doesn't work
# for us. But it's only needed to build libxaw, for which we can use
# the existing (incomplete) installation in /usr, see above
#libxpm:
# externals:
# - spec: [email protected]
Expand All @@ -163,16 +151,15 @@ packages:
mysql:
buildable: False
externals:
- spec: [email protected]
prefix: /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/mysql-8.0.31
modules: [mysql/8.0.31]
- spec: [email protected]
prefix: /ncrc/proj/epic/spack-stack/mysql-8.0.36
ncurses:
externals:
- spec: [email protected]+termlib abi=6
prefix: /usr
openjdk:
externals:
- spec: [email protected].16_8-suse-150000.3.83.1-x8664
- spec: [email protected].22
prefix: /usr
openssh:
externals:
Expand All @@ -183,6 +170,11 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
# openssl:
# buildable: False
# externals:
# - spec: [email protected]
# prefix: /sw/gaea-c5/python/3.9/anaconda-base/envs/noaa_py3.9/bin
perl:
externals:
- spec: [email protected]~cpanm+shared+threads
Expand All @@ -195,14 +187,14 @@ packages:
qt:
externals:
- spec: [email protected]
prefix: /lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/qt-5.15.2/5.15.2/gcc_64
prefix: /ncrc/proj/epic/spack-stack/qt-5.15.2/5.15.2/gcc_64
rdma-core:
externals:
- spec: rdma-core@37.0
- spec: rdma-core@42.0
prefix: /usr
rsync:
externals:
- spec: rsync@3.1.3
- spec: rsync@3.2.3
prefix: /usr
ruby:
externals:
Expand All @@ -214,20 +206,16 @@ packages:
prefix: /usr
slurm:
externals:
- spec: slurm@21.08.8
- spec: slurm@24.05.3
prefix: /usr
subversion:
externals:
- spec: subversion@1.10.6
- spec: subversion@1.14.1
prefix: /usr
tar:
externals:
- spec: [email protected]
prefix: /usr
texinfo:
externals:
- spec: [email protected]
prefix: /usr
wget:
externals:
- spec: [email protected]
Expand Down
38 changes: 38 additions & 0 deletions configs/sites/gaea-c6/compilers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
compilers:
- compiler:
spec: [email protected]
paths:
cc: cc
cxx: CC
f77: ftn
fc: ftn
operating_system: sles15
modules:
- PrgEnv-intel/8.5.0
- intel-classic/2023.2.0
- craype/2.7.30
- libfabric/1.20.1
flags:
cflags: "-gcc-name=/usr/bin/gcc-12"
cxxflags: "-gxx-name=/usr/bin/g++-12 -gcc-name=/usr/bin/gcc-12 -static-libstdc++"
fflags: "-gcc-name=/usr/bin/gcc-12"
environment:
set:
# OpenSUSE on Gaea C5 sets CONFIG_SITE so
# Automake-based builds are installed in lib64
# which confuses some packages.
CONFIG_SITE: ''
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
cc: /usr/bin/gcc-12
cxx: /usr/bin/g++-12
f77: /usr/bin/gfortran-12
fc: /usr/bin/gfortran-12
flags: {}
operating_system: sles15
modules:
- gcc-native-mixed/12.3
environment: {}
extra_rpaths: []
2 changes: 2 additions & 0 deletions configs/sites/gaea-c6/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
config:
build_jobs: 6
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
mirrors:
local-source:
fetch:
url: file:///lustre/f2/dev/role.epic/contrib/spack-stack/source-cache
url: file:///lustre/f2/dev/wpo/role.epic/contrib/spack-stack/source-cache
access_pair:
- null
- null
access_token: null
profile: null
endpoint_url: null
push:
url: file:///lustre/f2/dev/role.epic/contrib/spack-stack/source-cache
url: file:///lustre/f2/dev/wpo/role.epic/contrib/spack-stack/source-cache
access_pair:
- null
- null
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
modules:
default:
enable::
- tcl
tcl:
- lmod
lmod:
exclude:
- ecflow
include:
Expand Down
Loading
Loading