Skip to content

Update develop from release/1.9.0 (except selected site configs and NCO changes) #1667

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.

Sign up for GitHub

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

Merged
climbfuji merged 4 commits into from
Jun 11, 2025
Merged

Update develop from release/1.9.0 (except selected site configs and NCO changes) #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31749ad
Update submodule pointer for spack
Jun 11, 2025
cfa5c15
Update configs/sites/tier1/ursa from release/1.9.0
Jun 11, 2025
0158983
Update configs/common configs/containers configs/templates with scotc…
Jun 11, 2025
5dcbf92
Update configs/sites/tier1/ursa/packages_gcc.yaml
climbfuji Jun 11, 2025
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
8 changes: 5 additions & 3 deletions configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ packages:
magics:
require: "@4.15.3:"
mapl:
require: '@2.53.0 ~shared ~f2py'
require: '@2.53 ~shared ~f2py'
variants: '+pflogger'
met:
require:
Expand Down Expand Up @@ -285,9 +285,11 @@ packages:
py-versioneer:
require: '@0.28'
qt:
require: '@5'
require:
- '@5'
scotch:
require: '@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps'
require:
- '@7.0.4 +mpi+metis~shared~threads~mpi_thread+noarch+esmumps'
sfcio:
require: '@1.4.2'
shumlib:
Expand Down
3 changes: 3 additions & 0 deletions configs/common/packages_oneapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ packages:
qt:
require:
- '%gcc'
scotch:
require:
- '%gcc'
2 changes: 1 addition & 1 deletion configs/containers/specs/jedi-ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
w3emc@2.10.0,
nco,
esmf@8.8.0,
mapl@2.53.0,
mapl@2.53.4,
zlib-ng,
zstd,
odc@1.6.1,
Expand Down
2 changes: 2 additions & 0 deletions configs/sites/tier1/ursa/compilers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ compilers:
fc: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2/bin/ifort
flags: {}
operating_system: rocky9
target: x86_64
modules:
- intel-oneapi-compilers/2024.2.1
environment:
Expand All @@ -26,6 +27,7 @@ compilers:
fc: /usr/bin/gfortran
flags: {}
operating_system: rocky9
target: x86_64
modules: []
environment: {}
extra_rpaths: []
14 changes: 4 additions & 10 deletions configs/sites/tier1/ursa/packages_gcc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,8 @@ packages:
prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/openmpi-4.1.6-2dkf6t23iyw4xodxruh72yvmrhhvyoms
modules:
- openmpi/4.1.6
gcc-runtime:
externals:
- spec: gcc-runtime@11.4.1%gcc@11.4.1
prefix: /usr

ectrans:
require::
- '~mkl +fftw'
gsibec:
require::
- '~mkl'
py-numpy:
require::
- '@1.26'
- '^openblas'
24 changes: 11 additions & 13 deletions configs/sites/tier1/ursa/packages_oneapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
packages:
all:
compiler:: [oneapi@2024.2.1]
compiler:: [oneapi@2024.2.1,gcc@11.4.1]
providers:
mpi:: [intel-oneapi-mpi@2021.13]
# Change as appropriate to switch to intel-oneapi-mkl
Expand All @@ -16,22 +16,20 @@ packages:
modules:
- intel-oneapi-mpi/2021.13.1
prefix: /apps/spack-2024-12/linux-rocky9-x86_64/oneapi-2024.2.1/intel-oneapi-mpi-2021.13.1-ss72gbndvat3oz22sa6lhmlbjkeabrn4

intel-oneapi-mkl:
externals:
- spec: intel-oneapi-mkl@2024.2.1%oneapi@2024.2.1
modules:
- intel-oneapi-mkl/2024.2.1
prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-mkl-2024.2.1-srqwrbzwo2k7hxuuhlrxttburs5jvlat
intel-oneapi-runtime:
externals:
- spec: intel-oneapi-runtime@2024.2.1%oneapi@2024.2.1
prefix: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/intel-oneapi-compilers-2024.2.1-oqhstbmawnrsdw472p4pjsopj547o6xs/compiler/2024.2
modules:
- compiler-rt/2024.2.1
gcc-runtime:
externals:
- spec: gcc-runtime@11.4.1%gcc@11.4.1
prefix: /usr

# If using intel-oneapi-mkl, make appropriate changes below
ectrans:
require::
- '~mkl +fftw'
gsibec:
require::
- '~mkl'
py-numpy:
require::
- '@1.26'
- '^openblas'
2 changes: 1 addition & 1 deletion configs/templates/skylab-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spack:

# Mapl with various esmf tags
- mapl@2.53.0 ^esmf@8.6.1
- mapl@2.53.0 ^esmf@8.8.0
- mapl@2.53.4 ^esmf@8.8.0

# Various esmf tags (list all to avoid duplicate packages)
- esmf@=8.6.1 snapshot=none
Expand Down
2 changes: 1 addition & 1 deletion configs/templates/unified-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spack:

# Mapl with various esmf tags
- mapl@2.53.0 ^esmf@8.6.1
- mapl@2.53.0 ^esmf@8.8.0
- mapl@2.53.4 ^esmf@8.8.0

# Various esmf tags (list all to avoid duplicate packages)
- esmf@=8.6.1 snapshot=none
Expand Down
2 changes: 1 addition & 1 deletion spack
Open in desktop
Submodule spack updated 6 files
+12 −17 lib/spack/spack/cmd/mirror.py
+21 −2 lib/spack/spack/test/cmd/mirror.py
+1 −0 var/spack/repos/builtin/packages/crtm-fix/package.py
+1 −0 var/spack/repos/builtin/packages/mapl/package.py
+3 −2 var/spack/repos/builtin/packages/qt/package.py
+5 −0 var/spack/repos/builtin/packages/scotch/package.py
Loading