From 6d342f3afda9effe8f4dc7cdc56300b8f6bd854b Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 2 Oct 2025 19:17:00 +0000 Subject: [PATCH] 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