Skip to content

Commit cdbdaea

Browse files
authored
[release/2.0] Fix MET segmentation faults in spack-packages, navy-aws site config updates round 2 (#1844)
- Fix MET segmentation faults (spack-packages submodule, see [release/2.0] Fix MET segfaults (fixup_rpath --> environment modification) spack-packages#29). This requires adding libpython3.* to the whitelist in util/ldd_check.py - Site config updates for navy-aws tier1 site, add site config to NRL batch install script
1 parent e3778a8 commit cdbdaea

File tree

8 files changed

+44
-43
lines changed

8 files changed

+44
-43
lines changed

configs/sites/tier1/navy-aws/bootstrap.yaml

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
config:
2-
build_jobs: 6
2+
build_jobs: 24
33

44
# Overrides for spack build and staging areas to speed up builds
55
# and avoid errors with hard links on the NFS filesystem /contrib
66

7-
build_stage: ${HOME}/spack-stack-cache/build_stage
8-
test_stage: ${HOME}/spack-stack-cache/test_stage
9-
source_cache: ${HOME}/spack-stack-cache/source_cache
10-
misc_cache: ${HOME}/spack-stack-cache/misc_cache
7+
build_stage: /scratch/spack-stack-cache/build_stage
8+
test_stage: /scratch/spack-stack-cache/test_stage
9+
source_cache: /scratch/spack-stack-cache/source_cache
10+
misc_cache: /scratch/spack-stack-cache/misc_cache
Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
mirrors:
2-
local-source:
3-
fetch:
4-
url: file:///contrib/spack-stack/source-cache
5-
access_pair:
6-
- null
7-
- null
8-
access_token: null
9-
profile: null
10-
endpoint_url: null
11-
push:
12-
url: file:///contrib/spack-stack/source-cache
13-
access_pair:
14-
- null
15-
- null
16-
access_token: null
17-
profile: null
18-
endpoint_url: null
2+
local-source: file:///project/spack-stack/source-cache
3+
local-binary: file:///project/spack-stack/build-cache
4+

configs/sites/tier1/navy-aws/packages.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@ packages:
22
# Modification of common packages
33

44
# All other packages listed alphabetically
5-
autoconf:
6-
externals:
7-
8-
prefix: /usr
9-
automake:
10-
externals:
11-
12-
prefix: /usr
135
bash:
146
externals:
157

configs/sites/tier1/navy-aws/packages_gcc-13.3.1.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,7 @@ packages:
2626
openmpi:
2727
externals:
2828
29-
prefix: /project/spack-stack/openmpi-4.1.8/gcc-13.3.1
29+
#prefix: /project/spack-stack/openmpi-4.1.8/gcc-13.3.1
30+
modules:
31+
- openmpi/4.1.8
32+

repos/builtin

util/ldd_check.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/usr/bin/env python3
22

33
# Whitelist file patterns (checked with re.match()) that will be satisfied by
4-
# compiler & MPI modules (though arguably these should be added as extra
5-
# rpaths).
4+
# compiler, MPI, and Python modules (though arguably these should be added as
5+
# extra rpaths).
66
whitelist = [
77
"^libmkl.+",
88
"^libifcore.so.*",
9+
"^libpython3.*",
910
]
1011

1112
########

util/nrl/batch_install.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ fi
103103
SPACK_STACK_BATCH_HOST=$(echo ${HOSTNAME} | cut -d "." -f 1)
104104
SPACK_STACK_BATCH_HOST=${SPACK_STACK_BATCH_HOST//[0-9]/}
105105

106+
# Workaround for ParallelWorks login nodes
107+
if [[ "${SPACK_STACK_BATCH_HOST}" == *"awsneptunecluster"* ]]; then
108+
SPACK_STACK_BATCH_HOST="navy-aws"
109+
fi
110+
106111
case ${SPACK_STACK_BATCH_HOST} in
107112
atlantis)
108113
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.1" "oneapi@=2025.3.0" "gcc@=13.4.0" "clang@=21.1.0")
@@ -139,6 +144,13 @@ case ${SPACK_STACK_BATCH_HOST} in
139144
SPACK_STACK_BOOTSTRAP_MIRROR="/p/cwfs/projects/NEPTUNE/spack-stack/bootstrap-mirror"
140145
SPACK_STACK_CARGO_MIRROR="/p/cwfs/projects/NEPTUNE/spack-stack/cargo-mirror"
141146
;;
147+
navy-aws)
148+
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.3.0" "gcc@=13.3.1")
149+
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "cylc-dev")
150+
SPACK_STACK_MODULE_CHOICE="tcl"
151+
SPACK_STACK_BOOTSTRAP_MIRROR="/project/spack-stack/bootstrap-mirror"
152+
SPACK_STACK_CARGO_MIRROR="/project/spack-stack/cargo-mirror"
153+
;;
142154
tusk)
143155
SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.0" "gcc@=12.1.0")
144156
SPACK_STACK_BATCH_TEMPLATES=("neptune-dev")
@@ -222,6 +234,13 @@ function fix_permissions() {
222234
fi
223235
nice -n 19 lfs find ${dir} -type f -print0 | xargs --null chmod a+r
224236
;;
237+
navy-aws)
238+
nice -n 19 find ${dir} -type d -print0 | xargs --null chmod a+rx
239+
if [[ ${executables} -eq 1 ]]; then
240+
nice -n 19 find ${dir} -type f -executable -print0 | xargs --null chmod a+rx
241+
fi
242+
nice -n 19 find ${dir} -type f -print0 | xargs --null chmod a+r
243+
;;
225244
tusk)
226245
nice -n 19 lfs find ${dir} -type d -print0 | xargs --null chmod a+rx
227246
# In case the find command returns no executables
@@ -427,6 +446,15 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do
427446
umask 0022
428447
module purge
429448
;;
449+
navy-aws)
450+
umask 0022
451+
module purge
452+
case ${compiler} in
453+
gcc-13.3.1)
454+
module use /project/spack-stack/openmpi-4.1.8/gcc-13.3.1/modulefiles
455+
;;
456+
esac
457+
;;
430458
tusk)
431459
umask 0022
432460
set +e

0 commit comments

Comments
 (0)