From b59c02ee5a288a571a89c37565b44db72b8c1cb7 Mon Sep 17 00:00:00 2001 From: germann_e Date: Wed, 16 Oct 2024 15:39:07 +0200 Subject: [PATCH] FIX: move spack-psi bye one folder --- env/rhel7/x86_64/admin/stable/spack.yaml | 4 ++-- env/rhel7/x86_64/admin/testing/spack.yaml | 4 ++-- env/rhel7/x86_64/admin/unstable/spack.yaml | 4 ++-- env/rhel7/x86_64/users/stable/spack.yaml | 6 +++--- env/rhel7/x86_64/users/unstable/spack.yaml | 8 ++++---- env/sles15/aarch64/admin/stable/spack.yaml | 4 ++-- env/sles15/aarch64/admin/testing/spack.yaml | 4 ++-- env/sles15/aarch64/admin/unstable/spack.yaml | 4 ++-- env/sles15/aarch64/users/stable/spack.yaml | 6 +++--- env/sles15/aarch64/users/unstable/spack.yaml | 8 ++++---- env/sles15/x86_64/admin/stable/spack.yaml | 4 ++-- env/sles15/x86_64/admin/testing/spack.yaml | 4 ++-- env/sles15/x86_64/admin/unstable/spack.yaml | 4 ++-- env/sles15/x86_64/users/stable/spack.yaml | 6 +++--- env/sles15/x86_64/users/unstable/spack.yaml | 8 ++++---- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/env/rhel7/x86_64/admin/stable/spack.yaml b/env/rhel7/x86_64/admin/stable/spack.yaml index c410dc4..5fa2efd 100644 --- a/env/rhel7/x86_64/admin/stable/spack.yaml +++ b/env/rhel7/x86_64/admin/stable/spack.yaml @@ -13,8 +13,8 @@ spack: - gcc_12.3.0_openmpi: - opal@master/l4dkgyf include: - - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel7/x86_64/admin/testing/spack.yaml b/env/rhel7/x86_64/admin/testing/spack.yaml index da216f7..fcc3df9 100644 --- a/env/rhel7/x86_64/admin/testing/spack.yaml +++ b/env/rhel7/x86_64/admin/testing/spack.yaml @@ -8,8 +8,8 @@ spack: # Strongly adviced to avoid problems with buildcaches padded_length: 256 include: - - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel7/x86_64/admin/unstable/spack.yaml b/env/rhel7/x86_64/admin/unstable/spack.yaml index 16bb040..552ba85 100644 --- a/env/rhel7/x86_64/admin/unstable/spack.yaml +++ b/env/rhel7/x86_64/admin/unstable/spack.yaml @@ -21,8 +21,8 @@ spack: - oneapi_2024.1.0_openmpi: - gromacs@2024.1/pi5t2pp # ~cuda include: - - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/rhel7/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/rhel7/x86_64/users/stable/spack.yaml b/env/rhel7/x86_64/users/stable/spack.yaml index 469c9c6..d01ee7b 100644 --- a/env/rhel7/x86_64/users/stable/spack.yaml +++ b/env/rhel7/x86_64/users/stable/spack.yaml @@ -2,10 +2,10 @@ spack: concretizer: unify: false include: - - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml - - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml + - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml include_concrete: - - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/stable + - $spack/../spack-psi/env/rhel7/x86_64/admin/stable specs: [] upstreams: stable: diff --git a/env/rhel7/x86_64/users/unstable/spack.yaml b/env/rhel7/x86_64/users/unstable/spack.yaml index 747255b..72fa427 100644 --- a/env/rhel7/x86_64/users/unstable/spack.yaml +++ b/env/rhel7/x86_64/users/unstable/spack.yaml @@ -2,11 +2,11 @@ spack: concretizer: unify: false include: - - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml - - $spack/spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/packages.yaml + - $spack/../spack-psi/env/rhel7/x86_64/sysconfigs/compilers.yaml include_concrete: - - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/stable - - /afs/psi.ch/sys/spack/system/spack-psi/env/rhel7/x86_64/admin/unstable + - $spack/../spack-psi/env/rhel7/x86_64/admin/stable + - $spack/../spack-psi/env/rhel7/x86_64/admin/unstable specs: [] upstreams: stable: diff --git a/env/sles15/aarch64/admin/stable/spack.yaml b/env/sles15/aarch64/admin/stable/spack.yaml index 220ff9f..0c62ab4 100644 --- a/env/sles15/aarch64/admin/stable/spack.yaml +++ b/env/sles15/aarch64/admin/stable/spack.yaml @@ -9,8 +9,8 @@ spack: - gcc_12.3_mpich: - relion@4.0.1/ve5sish #+cuda include: - - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/sles15/aarch64/admin/testing/spack.yaml b/env/sles15/aarch64/admin/testing/spack.yaml index e75354c..d149a20 100644 --- a/env/sles15/aarch64/admin/testing/spack.yaml +++ b/env/sles15/aarch64/admin/testing/spack.yaml @@ -7,8 +7,8 @@ spack: # Strongly adviced to avoid problems with buildcaches padded_length: 256 include: - - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/sles15/aarch64/admin/unstable/spack.yaml b/env/sles15/aarch64/admin/unstable/spack.yaml index 688207e..15c36fd 100644 --- a/env/sles15/aarch64/admin/unstable/spack.yaml +++ b/env/sles15/aarch64/admin/unstable/spack.yaml @@ -23,8 +23,8 @@ spack: - nvhpc_23.9_openmpi: - quantum-espresso@7.3.1/le35al7 #+cuda include: - - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/sles15/aarch64/users/stable/spack.yaml b/env/sles15/aarch64/users/stable/spack.yaml index 55880db..c4f4655 100644 --- a/env/sles15/aarch64/users/stable/spack.yaml +++ b/env/sles15/aarch64/users/stable/spack.yaml @@ -2,10 +2,10 @@ spack: concretizer: unify: false include: - - $spack/spack-psi/env/sles15/aarch64/sysconfigs/packages.yaml - - $spack/spack-psi/env/sles15/aarch64/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/sles15/aarch64/sysconfigs/packages.yaml + - $spack/../spack-psi/env/sles15/aarch64/sysconfigs/compilers.yaml include_concrete: - - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/aarch64/admin/stable + - $spack/../spack-psi/env/sles15/aarch64/admin/stable specs: [] upstreams: stable: diff --git a/env/sles15/aarch64/users/unstable/spack.yaml b/env/sles15/aarch64/users/unstable/spack.yaml index 5e4caa8..44a3d42 100644 --- a/env/sles15/aarch64/users/unstable/spack.yaml +++ b/env/sles15/aarch64/users/unstable/spack.yaml @@ -2,11 +2,11 @@ spack: concretizer: unify: false include: - - $spack/spack-psi/env/sles15/aarch64/sysconfigs/packages.yaml - - $spack/spack-psi/env/sles15/aarch64/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/sles15/aarch64/sysconfigs/packages.yaml + - $spack/../spack-psi/env/sles15/aarch64/sysconfigs/compilers.yaml include_concrete: - - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/aarch64/admin/stable - - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/aarch64/admin/unstable + - $spack/../spack-psi/env/sles15/aarch64/admin/stable + - $spack/../spack-psi/env/sles15/aarch64/admin/unstable specs: [] upstreams: stable: diff --git a/env/sles15/x86_64/admin/stable/spack.yaml b/env/sles15/x86_64/admin/stable/spack.yaml index ea7f827..c4352e8 100644 --- a/env/sles15/x86_64/admin/stable/spack.yaml +++ b/env/sles15/x86_64/admin/stable/spack.yaml @@ -11,8 +11,8 @@ spack: - gcc_12.3_mpich: - relion@4.0.1/ve5sish #+cuda include: - - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/sles15/x86_64/admin/testing/spack.yaml b/env/sles15/x86_64/admin/testing/spack.yaml index e75354c..d149a20 100644 --- a/env/sles15/x86_64/admin/testing/spack.yaml +++ b/env/sles15/x86_64/admin/testing/spack.yaml @@ -7,8 +7,8 @@ spack: # Strongly adviced to avoid problems with buildcaches padded_length: 256 include: - - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/sles15/x86_64/admin/unstable/spack.yaml b/env/sles15/x86_64/admin/unstable/spack.yaml index 0bae690..11cafe8 100644 --- a/env/sles15/x86_64/admin/unstable/spack.yaml +++ b/env/sles15/x86_64/admin/unstable/spack.yaml @@ -25,8 +25,8 @@ spack: - nvhpc_23.9_openmpi: - quantum-espresso@7.3.1/le35al7 #+cuda include: - - $spack/spack-psi/env/$os/$target_family/sysconfigs/packages.yaml - - $spack/spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/packages.yaml + - $spack/../spack-psi/env/$os/$target_family/sysconfigs/compilers.yaml mirrors: local_psi: file:///afs/psi.ch/software/spack/testing modules: diff --git a/env/sles15/x86_64/users/stable/spack.yaml b/env/sles15/x86_64/users/stable/spack.yaml index 6872692..a9ed1e1 100644 --- a/env/sles15/x86_64/users/stable/spack.yaml +++ b/env/sles15/x86_64/users/stable/spack.yaml @@ -2,10 +2,10 @@ spack: concretizer: unify: false include: - - $spack/spack-psi/env/sles15/x86_64/sysconfigs/packages.yaml - - $spack/spack-psi/env/sles15/x86_64/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/sles15/x86_64/sysconfigs/packages.yaml + - $spack/../spack-psi/env/sles15/x86_64/sysconfigs/compilers.yaml include_concrete: - - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/stable + - $spack/../spack-psi/env/sles15/x86_64/admin/stable specs: [] upstreams: stable: diff --git a/env/sles15/x86_64/users/unstable/spack.yaml b/env/sles15/x86_64/users/unstable/spack.yaml index d4f1123..144fccd 100644 --- a/env/sles15/x86_64/users/unstable/spack.yaml +++ b/env/sles15/x86_64/users/unstable/spack.yaml @@ -2,11 +2,11 @@ spack: concretizer: unify: false include: - - $spack/spack-psi/env/sles15/x86_64/sysconfigs/packages.yaml - - $spack/spack-psi/env/sles15/x86_64/sysconfigs/compilers.yaml + - $spack/../spack-psi/env/sles15/x86_64/sysconfigs/packages.yaml + - $spack/../spack-psi/env/sles15/x86_64/sysconfigs/compilers.yaml include_concrete: - - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/stable - - /afs/psi.ch/sys/spack/system/spack-psi/env/sles15/x86_64/admin/unstable + - $spack/../spack-psi/env/sles15/x86_64/admin/stable + - $spack/../spack-psi/env/sles15/x86_64/admin/unstable specs: [] upstreams: stable: