Skip to content

Commit c670815

Browse files
committed
util/nrl/batch_install.sh: neptune-ops with clang
1 parent 961ef6d commit c670815

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

util/nrl/batch_install.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ SPACK_STACK_BATCH_HOST=${SPACK_STACK_BATCH_HOST//[0-9]/}
106106
case ${SPACK_STACK_BATCH_HOST} in
107107
atlantis)
108108
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.1" "oneapi@=2025.3.0" "gcc@=13.4.0" "clang@=21.1.0")
109-
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "unified-dev" "cylc-dev")
109+
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-ops" "unified-dev" "cylc-dev")
110110
SPACK_STACK_MODULE_CHOICE="lmod"
111111
SPACK_STACK_BOOTSTRAP_MIRROR="/neptune_diagnostics/spack-stack/bootstrap-mirror"
112112
SPACK_STACK_CARGO_MIRROR="/neptune_diagnostics/spack-stack/cargo-mirror"
@@ -155,7 +155,7 @@ case ${SPACK_STACK_BATCH_HOST} in
155155
;;
156156
bounty)
157157
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.3.0" "gcc@=13.3.1" "clang@=21.1.1")
158-
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "unified-dev" "cylc-dev")
158+
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "neptune-ops" "unified-dev" "cylc-dev")
159159
SPACK_STACK_MODULE_CHOICE="tcl"
160160
SPACK_STACK_BOOTSTRAP_MIRROR="/home/dom/prod/spack-bootstrap-mirror"
161161
SPACK_STACK_CARGO_MIRROR="/home/dom/prod/spack-cargo-mirror"
@@ -334,8 +334,12 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
334334
if [[ "${template}" == "cylc-dev" && ! "${compiler_name}" == "gcc" ]]; then
335335
echo "Skipping template ${template} with compiler ${compiler}"
336336
continue
337-
# With clang, only neptune-dev
338-
elif [[ "${compiler_name}" == "clang" && ! "${template}" == "neptune-dev" ]]; then
337+
# With clang, only neptune-ops
338+
elif [[ "${compiler_name}" == "clang" && ! "${template}" == "neptune-ops" ]]; then
339+
echo "Skipping template ${template} with compiler ${compiler}"
340+
continue
341+
# With other compilers, skip neptune-ops
342+
elif [[ ! "${compiler_name}" == "clang" && "${template}" == "neptune-ops" ]]; then
339343
echo "Skipping template ${template} with compiler ${compiler}"
340344
continue
341345
# FMS compiler ICE: https://github.com/NOAA-GFDL/FMS/issues/1680

0 commit comments

Comments
 (0)