From 6d342f3afda9effe8f4dc7cdc56300b8f6bd854b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 2 Oct 2025 19:17:00 +0000 Subject: [PATCH 1/3] Update configs/sites/tier1/ursa/compilers.yaml and configs/sites/tier1/ursa/packages_oneapi.yaml for building unified environment on Ursa for spack-stack develop as of 2025/10/02 --- configs/sites/tier1/ursa/compilers.yaml | 9 ++++---- configs/sites/tier1/ursa/packages_oneapi.yaml | 21 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/configs/sites/tier1/ursa/compilers.yaml b/configs/sites/tier1/ursa/compilers.yaml index 4d96c8d5f..0f86cb3e2 100644 --- a/configs/sites/tier1/ursa/compilers.yaml +++ b/configs/sites/tier1/ursa/compilers.yaml @@ -13,9 +13,7 @@ compilers: - intel-oneapi-compilers/2024.2.1 environment: prepend_path: - PATH: '/usr/bin' - LD_LIBRARY_PATH: '/usr/lib:/usr/lib64' - CPATH: '/usr/include/c++/11/x86_64-redhat-linux' + CPATH: /usr/include/c++/11/x86_64-redhat-linux extra_rpaths: [] - compiler: @@ -30,5 +28,8 @@ compilers: target: x86_64 modules: - gcc/12.4.0 - environment: {} + environment: + prepend_path: + CPATH: /apps/spack-2024-12/linux-rocky9-x86_64/gcc-11.4.1/gcc-12.4.0-dsgnou52lpn2tus6mohdmcw5mjqmqrhj/lib/gcc/x86_64-pc-linux-gnu/12.4.0/include extra_rpaths: [] + diff --git a/configs/sites/tier1/ursa/packages_oneapi.yaml b/configs/sites/tier1/ursa/packages_oneapi.yaml index 5b33097a3..52d6f1f22 100644 --- a/configs/sites/tier1/ursa/packages_oneapi.yaml +++ b/configs/sites/tier1/ursa/packages_oneapi.yaml @@ -32,14 +32,15 @@ packages: 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@12.4.0%gcc@12.4.0 - prefix: /usr +# Commented out for spack v0.23 to avoid duplicate packages +# 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@12.4.0%gcc@12.4.0 +# prefix: /usr From 8439c0e9cae63ed3d83ed39fff00c55a6d196e8d Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 2 Oct 2025 19:22:01 +0000 Subject: [PATCH 2/3] Update configs/sites/tier1/ursa/mirrors.yaml and util/nrl/batch_install.sh to support batch installs on Ursa --- configs/sites/tier1/ursa/mirrors.yaml | 5 ++--- util/nrl/batch_install.sh | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/configs/sites/tier1/ursa/mirrors.yaml b/configs/sites/tier1/ursa/mirrors.yaml index 0891ae450..929956568 100644 --- a/configs/sites/tier1/ursa/mirrors.yaml +++ b/configs/sites/tier1/ursa/mirrors.yaml @@ -1,4 +1,3 @@ mirrors: - spack-public: - binary: false - url: https://mirror.spack.io + local-source: file:///scratch4/NCEPDEV/nems/Dom.Heinzeller/spack-stack-automation/source-cache + local-binary: file:///scratch4/NCEPDEV/nems/Dom.Heinzeller/spack-stack-automation/build-cache diff --git a/util/nrl/batch_install.sh b/util/nrl/batch_install.sh index 3e7c1ac64..79dcc4347 100755 --- a/util/nrl/batch_install.sh +++ b/util/nrl/batch_install.sh @@ -160,6 +160,14 @@ case ${SPACK_STACK_BATCH_HOST} in SPACK_STACK_BOOTSTRAP_MIRROR="/home/dom/prod/spack-bootstrap-mirror" SPACK_STACK_CARGO_MIRROR="/home/dom/prod/spack-cargo-mirror" ;; + ufe) + SPACK_STACK_BATCH_HOST=ursa + SPACK_STACK_BATCH_COMPILERS=("oneapi@=2024.2.1" "gcc@=12.4.0") + SPACK_STACK_BATCH_TEMPLATES=("unified-dev") + SPACK_STACK_MODULE_CHOICE="tcl" + SPACK_STACK_BOOTSTRAP_MIRROR="/scratch4/NCEPDEV/nems/Dom.Heinzeller/spack-stack-automation/bootstrap-mirror" + SPACK_STACK_CARGO_MIRROR="/scratch4/NCEPDEV/nems/Dom.Heinzeller/spack-stack-automation/cargo-mirror" + ;; *) echo "ERROR, host ${SPACK_STACK_BATCH_HOST} not configured" exit 1 @@ -236,6 +244,8 @@ function fix_permissions() { ;; bounty) ;; + ursa) + ;; *) echo "ERROR, xargs-chmod command not configured for ${host}" exit 1 @@ -434,6 +444,9 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do bounty) ulimit -s unlimited ;; + ursa) + module purge + ;; *) echo "ERROR, host ${host} not configured for resetting environment" exit 1 @@ -593,6 +606,8 @@ for compiler in "${SPACK_STACK_BATCH_COMPILERS[@]}"; do ;; bounty) ;; + ursa) + ;; *) echo "ERROR, post-install scripts not configured for ${host}" exit 1 From 0e1e48171f1ae34355ecf8ec6644dbb2dba0e419 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 2 Oct 2025 19:27:21 +0000 Subject: [PATCH 3/3] [skip ci]