Skip to content

Commit

Permalink
Merge branch 'release/1.9.0' into ursa-1.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rickgrubin-noaa authored Feb 12, 2025
2 parents 98c7b7f + 2ebe81a commit bde4e9d
Show file tree
Hide file tree
Showing 12 changed files with 341 additions and 67 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ubuntu-ci-x86_64-gnu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ jobs:
# https://github.com/spack/spack/issues/48971
echo "rust dependencies ..."
spack install --verbose --source --no-check-signature --only=dependencies rust 2>&1 | tee log.install.gnu-11.4.0-buildcache.${TEMPLATE}.001.rust-dependencies
# rust from source
echo "rust (from source) ..."
spack install --verbose --source --no-cache rust 2>&1 | tee log.install.gnu-11.4.0-buildcache.${TEMPLATE}.002.rust
Expand Down
2 changes: 1 addition & 1 deletion configs/sites/tier1/acorn/compilers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ compilers:
CONFIG_SITE: ''
extra_rpaths: []
- compiler:
spec: intel@2022.0.2.262
spec: intel@2022.2.0.262
paths:
cc: cc
cxx: CC
Expand Down
3 changes: 3 additions & 0 deletions configs/sites/tier1/acorn/packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,6 @@
externals:
- spec: [email protected]
prefix: /usr
esmf:
require:
- '+python'
4 changes: 1 addition & 3 deletions configs/sites/tier1/acorn/packages_intel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
py-numpy:
require::
- '^[virtuals=lapack,blas] openblas'
- '@:1.25'
- any_of: ['@:1.24']
when: '%[email protected]'
- '@1.26 %gcc'
# *DH
eckit:
require:
Expand Down
22 changes: 22 additions & 0 deletions configs/sites/tier1/s4/compilers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,27 @@ compilers:
LD_LIBRARY_PATH: /opt/intel/oneapi/2023.2/compiler/2023.2.0/linux/compiler/lib/intel64_lin:/opt/gcc/10.2.0/lib64:/opt/gcc/10.2.0/lib
CPATH: /opt/gcc/10.2.0/include
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
cc: /opt/intel/oneapi/2024/compiler/2024.2/bin/icx
cxx: /opt/intel/oneapi/2024/compiler/2024.2/bin/icpx
f77: /opt/intel/oneapi/2024/compiler/2024.2/bin/ifort
fc: /opt/intel/oneapi/2024/compiler/2024.2/bin/ifort
flags:
fflags: -diag-disable=10448
operating_system: rocky8
target: x86_64
modules:
- intel/2024.2
environment:
prepend_path:
PATH: /opt/gcc/10.2.0/bin
LD_LIBRARY_PATH: /opt/gcc/10.2.0/lib64:/opt/gcc/10.2.0/lib
CPATH: /opt/gcc/10.2.0/include
append_path:
PATH: /opt/intel/oneapi/2024/compiler/2024.2/opt/compiler/include/intel64
extra_rpaths: []
- compiler:
spec: gcc@=13.3.0
paths:
Expand Down Expand Up @@ -58,3 +79,4 @@ compilers:
modules: []
environment: {}
extra_rpaths: []

23 changes: 16 additions & 7 deletions configs/sites/tier1/s4/packages.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
packages:
all:
compiler:: [[email protected],[email protected]]
compiler:: [[email protected],[email protected]]
#compiler:: [[email protected],[email protected]]
providers:
mpi:: [[email protected]]
mpi:: [[email protected]]
# mpi:: [[email protected]]
# Remove the next three lines to switch to intel-oneapi-mkl
blas:: [openblas]
fftw-api:: [fftw]
Expand All @@ -14,18 +16,24 @@ packages:
### MPI, Python, MKL
mpi:
buildable: False
#intel-oneapi-mpi:
# externals:
# - spec: [email protected]%[email protected] +classic-names
# prefix: /opt/intel/oneapi/2024
# modules:
# - intel/2023.2
intel-oneapi-mpi:
externals:
- spec: intel-oneapi-mpi@2021.10.0%[email protected] +classic-names
prefix: /opt/intel/oneapi/2023.2
- spec: intel-oneapi-mpi@2021.13%[email protected]
prefix: /opt/intel/oneapi/2024
modules:
- intel/2023.2
- intel/2024.2
intel-oneapi-mkl:
# Remove buildable: False and uncomment externals section below to use intel-oneapi-mkl
buildable: False
#externals:
#- spec: [email protected]%[email protected]
# prefix: /opt/intel/oneapi/2023.2
# prefix: /opt/intel/oneapi/2024
# modules:
# - intel/2023.2
# Remove this section to switch to intel-oneapi-mkl
Expand Down Expand Up @@ -80,7 +88,7 @@ packages:
externals:
- spec: [email protected]
prefix: /usr
# OS curl/openssl cause problems
# OS curl/openssl cause problems
#curl:
# externals:
# - spec: [email protected]+gssapi+ldap+nghttp2
Expand Down Expand Up @@ -203,3 +211,4 @@ packages:
externals:
- spec: [email protected]
prefix: /usr

45 changes: 45 additions & 0 deletions configs/sites/tier1/wcoss2/compilers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
compilers:
- compiler:
spec: [email protected]
paths:
cc: cc
cxx: CC
f77: ftn
fc: ftn
flags: {}
operating_system: sles15
modules:
- PrgEnv-intel/8.3.3
- craype/2.7.17
- intel/19.1.3.304
- libfabric
environment:
set:
# OpenSUSE on WCOSS2 machines sets CONFIG_SITE so
# Automake-based builds are installed in lib64
# which confuses some packages.
CONFIG_SITE: ''
unset: [PYTHONPATH]
extra_rpaths: []
- compiler:
spec: [email protected]
paths:
cc: cc
cxx: CC
f77: ftn
fc: ftn
flags: {}
operating_system: sles15
modules:
- PrgEnv-gnu/8.3.3
- craype/2.7.13
- gcc/10.2.0
- libfabric
environment:
set:
# OpenSUSE on WCOSS2 machines sets CONFIG_SITE so
# Automake-based builds are installed in lib64
# which confuses some packages.
CONFIG_SITE: ''
unset: [PYTHONPATH]
extra_rpaths: []
5 changes: 5 additions & 0 deletions configs/sites/tier1/wcoss2/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
config:
build_jobs: 6
template_dirs:
- $env/site/templates
- $spack/share/spack/templates
16 changes: 16 additions & 0 deletions configs/sites/tier1/wcoss2/modules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
modules:
default:
enable::
- lmod
lmod:
include:
- python
hierarchy:
- mpi
- hdf5_virtual
- netcdf_c_virtual
- esmf_virtual
- python_virtual
boost:
suffixes:
'%gcc': gcc
126 changes: 126 additions & 0 deletions configs/sites/tier1/wcoss2/packages.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
packages:
#
### Set compiler.
#
all:
prefer: ['%[email protected]']
compiler:: [[email protected]]
providers:
mpi: [cray-mpich]
#
### Strictly set virtual package providers.
#
mpi:
buildable: False
require: cray-mpich
fftw-api:
require: fftw
blas:
require: openblas
lapack:
require: openblas
jpeg:
require: libjpeg-turbo
#
### External packages.
#
cray-mpich:
externals:
- spec: [email protected]~wrappers
modules:
- libfabric
- craype-network-ofi
- cray-mpich/8.1.9
#
### Individual package settings.
# Use `require::` to override require's from {common,site}/packages.yaml,
# and `require:<newline> - '...'` to add to existing ones.
#
boost:
require::
- '@1.84 ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams
~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex
+serialization ~signals +system +test +thread +timer ~wave visibility=hidden cxxstd=17'
cdo:
require:
- 'grib2=none' # avoids eccodes/grib-api dependency
- '%intel'
- any_of: ["@2.2.2"]
when: "%[email protected]"
message: "2.3.0 is the last version to use C++17"
- any_of: ["@2.0.5"]
when: "%[email protected]"
message: "2.0.5 is the last version to use C++14"
curl:
require:
- ~nghttp2 # avoid nghttp2 dependency
eccodes:
require:
- any_of: ["@2.25.0"]
when: "%[email protected]"
message: "2.25.0 is the last version to use C++11 (as opposed to C++17)"
ecmwf-atlas:
'require:':
- +fckit ~trans ~fftw # disabling trans and fftw to minimize dependencies; older version because newer eckit doesn't build with intel@19
- any_of: ['@:0.39']
when: '%[email protected]'
ectrans:
require::
- '@1.2.0 ~mkl +fftw'
esmf:
require:
- snapshot=none # make sure spack-stack doesn't accidentally give us a beta snapshot
- '~python'
fckit:
'require:': +eckit # older version needed for older eckit & ecmwf-atlas
flex:
require: '@2.6.4'
gcc-runtime:
require: '%gcc'
gdal:
variants: ~curl
gettext:
version: ['0.19.7']
git-lfs:
require: '%gcc'
glib:
require:
- any_of: ['@:2.74.3']
when: '%intel@:19'
gsibec:
require::
- '@1.2.1 ~mkl'
harfbuzz:
require: '%gcc'
libffi:
require: '@3.3'
libunistring:
require: '@:1.0'
mapl:
require:
- ~pflogger ~fargparse ~extdata2g # minimize dependencies
netcdf-c:
'require:': +mpi ~parallel-netcdf ~dap ~blosc ~szip build_system=autotools # disabling dap prevents network access; disabling blosc and szip reduces dependencies
patchelf:
version: ['0.13.1']
py-cython::
require: '@0.29.36'
py-numpy:
require::
- '^[virtuals=lapack,blas] openblas'
- '@:1.25'
- any_of: ['@:1.24']
when: '%intel@:19'
py-pandas:
'require:': ~excel # minimize dependencies
py-scipy:
require:
- any_of: ["@1.10.1"]
when: '%intel@:19'
py-setuptools:
require: '@63.4.3' # avoid duplicate build deps
rhash:
version: ['1.3.5']
subversion:
require:
- ~serf +pic # avoid serf dependency
Loading

0 comments on commit bde4e9d

Please sign in to comment.