diff --git a/configs/sites/tier1/navy-aws/bootstrap.yaml b/configs/sites/tier1/navy-aws/bootstrap.yaml deleted file mode 100644 index 8602ff6ff..000000000 --- a/configs/sites/tier1/navy-aws/bootstrap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -bootstrap: - sources: - - name: local-binaries - metadata: /project/spack-stack/spack-bootstrap-mirror/metadata/binaries - - name: local-sources - metadata: /project/spack-stack/spack-bootstrap-mirror/metadata/sources - trusted: - local-sources: true - local-binaries: true diff --git a/configs/sites/tier1/navy-aws/config.yaml b/configs/sites/tier1/navy-aws/config.yaml index dd48c4196..50f07d3a4 100644 --- a/configs/sites/tier1/navy-aws/config.yaml +++ b/configs/sites/tier1/navy-aws/config.yaml @@ -1,10 +1,10 @@ config: - build_jobs: 6 + build_jobs: 24 # Overrides for spack build and staging areas to speed up builds # and avoid errors with hard links on the NFS filesystem /contrib - build_stage: ${HOME}/spack-stack-cache/build_stage - test_stage: ${HOME}/spack-stack-cache/test_stage - source_cache: ${HOME}/spack-stack-cache/source_cache - misc_cache: ${HOME}/spack-stack-cache/misc_cache + build_stage: /scratch/spack-stack-cache/build_stage + test_stage: /scratch/spack-stack-cache/test_stage + source_cache: /scratch/spack-stack-cache/source_cache + misc_cache: /scratch/spack-stack-cache/misc_cache diff --git a/configs/sites/tier1/navy-aws/mirrors.yaml b/configs/sites/tier1/navy-aws/mirrors.yaml index 3d247981f..696c473d2 100644 --- a/configs/sites/tier1/navy-aws/mirrors.yaml +++ b/configs/sites/tier1/navy-aws/mirrors.yaml @@ -1,18 +1,4 @@ mirrors: - local-source: - fetch: - url: file:///contrib/spack-stack/source-cache - access_pair: - - null - - null - access_token: null - profile: null - endpoint_url: null - push: - url: file:///contrib/spack-stack/source-cache - access_pair: - - null - - null - access_token: null - profile: null - endpoint_url: null + local-source: file:///project/spack-stack/source-cache + local-binary: file:///project/spack-stack/build-cache + diff --git a/configs/sites/tier1/navy-aws/packages.yaml b/configs/sites/tier1/navy-aws/packages.yaml index 6357d6eec..03438b703 100644 --- a/configs/sites/tier1/navy-aws/packages.yaml +++ b/configs/sites/tier1/navy-aws/packages.yaml @@ -2,14 +2,6 @@ packages: # Modification of common packages # All other packages listed alphabetically - autoconf: - externals: - - spec: autoconf@2.69 - prefix: /usr - automake: - externals: - - spec: automake@1.16.2 - prefix: /usr bash: externals: - spec: bash@5.1.8 diff --git a/configs/sites/tier1/navy-aws/packages_gcc-13.3.1.yaml b/configs/sites/tier1/navy-aws/packages_gcc-13.3.1.yaml index b26bc7752..8a7f3f4f8 100644 --- a/configs/sites/tier1/navy-aws/packages_gcc-13.3.1.yaml +++ b/configs/sites/tier1/navy-aws/packages_gcc-13.3.1.yaml @@ -26,4 +26,7 @@ packages: openmpi: externals: - spec: openmpi@4.1.8 - prefix: /project/spack-stack/openmpi-4.1.8/gcc-13.3.1 + #prefix: /project/spack-stack/openmpi-4.1.8/gcc-13.3.1 + modules: + - openmpi/4.1.8 + diff --git a/repos/builtin b/repos/builtin index 76b9f1974..f37a67b80 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 76b9f1974aee9776afb290bddd123fd31cac4fca +Subproject commit f37a67b804eb966306ae3b8420cada9cf14d1c4a diff --git a/util/ldd_check.py b/util/ldd_check.py index 9cee8a838..a298474cb 100755 --- a/util/ldd_check.py +++ b/util/ldd_check.py @@ -1,11 +1,12 @@ #!/usr/bin/env python3 # Whitelist file patterns (checked with re.match()) that will be satisfied by -# compiler & MPI modules (though arguably these should be added as extra -# rpaths). +# compiler, MPI, and Python modules (though arguably these should be added as +# extra rpaths). whitelist = [ "^libmkl.+", "^libifcore.so.*", + "^libpython3.*", ] ######## diff --git a/util/nrl/batch_install.sh b/util/nrl/batch_install.sh index 4cb3d5bb4..d3ee94563 100755 --- a/util/nrl/batch_install.sh +++ b/util/nrl/batch_install.sh @@ -103,6 +103,11 @@ fi SPACK_STACK_BATCH_HOST=$(echo ${HOSTNAME} | cut -d "." -f 1) SPACK_STACK_BATCH_HOST=${SPACK_STACK_BATCH_HOST//[0-9]/} +# Workaround for ParallelWorks login nodes +if [[ "${SPACK_STACK_BATCH_HOST}" == *"awsneptunecluster"* ]]; then + SPACK_STACK_BATCH_HOST="navy-aws" +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") @@ -139,6 +144,13 @@ case ${SPACK_STACK_BATCH_HOST} in SPACK_STACK_BOOTSTRAP_MIRROR="/p/cwfs/projects/NEPTUNE/spack-stack/bootstrap-mirror" SPACK_STACK_CARGO_MIRROR="/p/cwfs/projects/NEPTUNE/spack-stack/cargo-mirror" ;; + navy-aws) + SPACK_STACK_BATCH_COMPILERS=("oneapi@=2025.3.0" "gcc@=13.3.1") + SPACK_STACK_BATCH_TEMPLATES=("neptune-dev" "cylc-dev") + SPACK_STACK_MODULE_CHOICE="tcl" + SPACK_STACK_BOOTSTRAP_MIRROR="/project/spack-stack/bootstrap-mirror" + SPACK_STACK_CARGO_MIRROR="/project/spack-stack/cargo-mirror" + ;; tusk) SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.0" "gcc@=12.1.0") SPACK_STACK_BATCH_TEMPLATES=("neptune-dev") @@ -222,6 +234,13 @@ function fix_permissions() { fi nice -n 19 lfs find ${dir} -type f -print0 | xargs --null chmod a+r ;; + navy-aws) + nice -n 19 find ${dir} -type d -print0 | xargs --null chmod a+rx + if [[ ${executables} -eq 1 ]]; then + nice -n 19 find ${dir} -type f -executable -print0 | xargs --null chmod a+rx + fi + nice -n 19 find ${dir} -type f -print0 | xargs --null chmod a+r + ;; tusk) nice -n 19 lfs find ${dir} -type d -print0 | xargs --null chmod a+rx # In case the find command returns no executables @@ -427,6 +446,15 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do umask 0022 module purge ;; + navy-aws) + umask 0022 + module purge + case ${compiler} in + gcc-13.3.1) + module use /project/spack-stack/openmpi-4.1.8/gcc-13.3.1/modulefiles + ;; + esac + ;; tusk) umask 0022 set +e