Skip to content

NRL: Update to LLVM 22 and ESMF 9.0.0b10 #1934

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 8 commits into from
Feb 27, 2026
Merged

NRL: Update to LLVM 22 and ESMF 9.0.0b10 #1934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
753cf86
Update LLVM to 22.1.0 in configs/sites/tier1/atlantis/packages_clang-…
climbfuji Feb 26, 2026
da0a56e
Update LLVM to 22.1.0 in configs/sites/tier2/bounty/packages_clang-22…
climbfuji Feb 26, 2026
ef81a3d
Update spack-ext/lib/jcsda-emc/spack-stack/stack/compiler_utils.py: m…
climbfuji Feb 26, 2026
af47d7e
Update .gitmodules and submodule pointer for repos/builtin: esmf@9.0.…
climbfuji Feb 26, 2026
ce958c4
Bump NEPTUNE environments to esmf@9.0.0b10
climbfuji Feb 26, 2026
21b4ccd
Revert .gitmodules and update submodule pointer for repos/builtin
climbfuji Feb 26, 2026
e25f30d
Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…
climbfuji Feb 27, 2026
87b9e4c
Update util/nrl/batch_install.sh for LLVM 22 on Atlantis, Bounty
climbfuji Feb 27, 2026
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
1 change: 1 addition & 0 deletions configs/common/packages.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ packages:
- '@=8.8.0 snapshot=none'
- '@=8.9.0 snapshot=none'
- '@=8.9.1 snapshot=none'
- '@=9.0.0b10 snapshot=b10'
- any_of:
- 'fflags="-fp-model precise" cxxflags="-fp-model precise"'
when: '%intel'
Expand Down
30 changes: 0 additions & 30 deletions configs/sites/tier1/atlantis/packages_clang-21.1.0.yaml
View file
Open in desktop

This file was deleted.

34 changes: 34 additions & 0 deletions configs/sites/tier1/atlantis/packages_clang-22.1.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
packages:
all:
require:
- any_of: ['%llvm@=22.1.0']
when: '%llvm'
mpi:
buildable: False
require:
- "openmpi@4.1.8"
llvm:
externals:
- spec: llvm@22.1.0 +flang ~libomptarget
prefix: /gpfs/neptune/spack-stack/llvm-22.1.0
modules:
- llvm/22.1.0
extra_attributes:
compilers:
c: /gpfs/neptune/spack-stack/llvm-22.1.0/bin/clang
cxx: /gpfs/neptune/spack-stack/llvm-22.1.0/bin/clang++
fortran: /gpfs/neptune/spack-stack/llvm-22.1.0/bin/flang-new
extra_rpaths:
- /gpfs/neptune/spack-stack/llvm-22.1.0/lib
- /gpfs/neptune/spack-stack/llvm-22.1.0/lib/x86_64-unknown-linux-gnu
hwloc:
buildable: False
externals:
- spec: hwloc@2.13.0
prefix: /gpfs/neptune/spack-stack/llvm-22.1.0
openmpi:
externals:
- spec: openmpi@4.1.8 ~internal-hwloc +two_level_namespace
prefix: /gpfs/neptune/spack-stack/openmpi-4.1.8/llvm-22.1.0
modules:
- openmpi/4.1.8
21 changes: 0 additions & 21 deletions configs/sites/tier2/bounty/packages_clang-21.1.1.yaml
View file
Open in desktop

This file was deleted.

21 changes: 21 additions & 0 deletions configs/sites/tier2/bounty/packages_clang-22.1.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
packages:
all:
require:
- any_of: ['%llvm@=22.1.0']
when: '%llvm'
mpi:
require:
- "openmpi@=5.0.8"
llvm:
buildable: False
externals:
- spec: llvm@22.1.0 +flang ~libomptarget
prefix: /home/dom/prod/llvm-22.1.0
extra_attributes:
compilers:
c: /home/dom/prod/llvm-22.1.0/bin/clang
cxx: /home/dom/prod/llvm-22.1.0/bin/clang++
fortran: /home/dom/prod/llvm-22.1.0/bin/flang-new
extra_rpaths:
- /home/dom/prod/llvm-22.1.0/lib
- /home/dom/prod/llvm-22.1.0/lib/x86_64-unknown-linux-gnu
12 changes: 6 additions & 6 deletions configs/templates/neptune-dev-llvm/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ spack:
include: []

specs:
- neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
- neptune-env +debug +openmp +espc +ncview ^esmf@=8.9.1
- neptune-env ~debug ~openmp +espc +ncview ^esmf@=8.9.1
- neptune-env +debug ~openmp +espc +ncview ^esmf@=8.9.1
- neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10
- neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b10
- neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b10
- neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b10
# Until we can build the entire set of dependencies for
# neptune-python-env and jedi-neptune-env, we need to
# add the required packages for the NEPTUNE standalone
# model manually
#- neptune-python-env ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
#- jedi-neptune-env +adp ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
#- neptune-python-env ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10
#- jedi-neptune-env +adp ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10
- py-numpy
- crtm@3.1.3

Expand Down
12 changes: 6 additions & 6 deletions configs/templates/neptune-dev/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ spack:
include: []

specs:
- neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
- neptune-env +debug +openmp +espc +ncview ^esmf@=8.9.1
- neptune-env ~debug ~openmp +espc +ncview ^esmf@=8.9.1
- neptune-env +debug ~openmp +espc +ncview ^esmf@=8.9.1
- neptune-python-env +gittools ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
- jedi-neptune-env +adp +jedi ^neptune-env ~debug +openmp +espc +ncview ^esmf@=8.9.1
- neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10
- neptune-env +debug +openmp +espc +ncview ^esmf@=9.0.0b10
- neptune-env ~debug ~openmp +espc +ncview ^esmf@=9.0.0b10
- neptune-env +debug ~openmp +espc +ncview ^esmf@=9.0.0b10
- neptune-python-env +gittools ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10
- jedi-neptune-env +adp +jedi ^neptune-env ~debug +openmp +espc +ncview ^esmf@=9.0.0b10
- crtm@3.1.3

packages:
Expand Down
2 changes: 1 addition & 1 deletion configs/templates/neptune-ops/spack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spack:
include: []

specs:
- neptune-env ~debug +openmp +espc ~ncview ^esmf@=8.9.1
- neptune-env ~debug +openmp +espc ~ncview ^esmf@=9.0.0b10

packages:
# Turn off python variant for esmf
Expand Down
2 changes: 1 addition & 1 deletion repos/builtin
Open in desktop
Submodule builtin updated 1 files
+2 −1 repos/spack_repo/builtin/packages/esmf/package.py
4 changes: 3 additions & 1 deletion spack-ext/lib/jcsda-emc/spack-stack/stack/compiler_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from spack.provider_index import ProviderIndex

from spack.extensions.stack.common import ALIASES
from spack.extensions.stack.common import RED, RESET
from spack.extensions.stack.common import GREEN, RED, RESET
from spack.extensions.stack.common import get_preferred_compiler


Expand Down Expand Up @@ -153,3 +153,5 @@ def check_preferred_compiler():
raise Exception(f"{RED}Detected {errors} compiler mismatch!{RESET}")
elif errors:
raise Exception(f"{RED}Detected {errors} compiler mismatches!{RESET}")
else:
logging.info(f"{GREEN}No compiler mismatches found.{RESET}")
10 changes: 5 additions & 5 deletions util/nrl/batch_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ fi

case ${SPACK_STACK_BATCH_HOST} in
atlantis)
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.1" "oneapi@=2025.3.0" "gcc@=13.4.0" "clang@=21.1.0")
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.1" "oneapi@=2025.3.0" "gcc@=13.4.0" "clang@=22.1.0")
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-dev-llvm" "unified-dev" "cylc-dev")
SPACK_STACK_MODULE_CHOICE="lmod"
SPACK_STACK_BOOTSTRAP_MIRROR="/neptune_diagnostics/spack-stack/bootstrap-mirror"
Expand Down Expand Up @@ -166,7 +166,7 @@ case ${SPACK_STACK_BATCH_HOST} in
SPACK_STACK_CARGO_MIRROR="/home/dom/prod/spack-cargo-mirror"
;;
bounty)
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.3.0" "gcc@=13.3.1" "clang@=21.1.1")
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.3.0" "gcc@=13.3.1" "clang@=22.1.1")
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-dev-llvm" "unified-dev" "cylc-dev")
SPACK_STACK_MODULE_CHOICE="tcl"
SPACK_STACK_BOOTSTRAP_MIRROR="/home/dom/prod/spack-bootstrap-mirror"
Expand Down Expand Up @@ -412,9 +412,9 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
umask 0022
module purge
case ${compiler} in
clang@=21.1.0)
module use /gpfs/neptune/spack-stack/llvm-21.1.0/modulefiles
module use /gpfs/neptune/spack-stack/openmpi-4.1.8/llvm-21.1.0/modulefiles
clang@=22.1.0)
module use /gpfs/neptune/spack-stack/llvm-22.1.0/modulefiles
module use /gpfs/neptune/spack-stack/openmpi-4.1.8/llvm-22.1.0/modulefiles
;;
gcc@=13.4.0)
module use /gpfs/neptune/spack-stack/gcc-13.4.0/modulefiles
Expand Down