From 5c6b427e38a8ab1770c155969a8e7f14cecec330 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 17 Mar 2025 10:14:54 +0100 Subject: [PATCH] spack v1.0 support: `%foo +bar` -> `+bar %foo` Spack v1.0 will parse `pkg %gcc +foo` as "pkg with direct dependency gcc with variant foo enabled" instead of "pkg with variant foo enabled and compiler gcc". Reorder as `pkg +foo %gcc` to be compatible with Spack v0.x and v1.0. --- .../radiuss/toss_4_x86_64_ib/packages.yaml | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/spack-environments/radiuss/toss_4_x86_64_ib/packages.yaml b/spack-environments/radiuss/toss_4_x86_64_ib/packages.yaml index bd0c963..12327f1 100644 --- a/spack-environments/radiuss/toss_4_x86_64_ib/packages.yaml +++ b/spack-environments/radiuss/toss_4_x86_64_ib/packages.yaml @@ -29,44 +29,44 @@ packages:: mvapich2: buildable: false externals: - - spec: mvapich2@2.3.7%intel@=19.1.2 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %intel@=19.1.2 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2 - - spec: mvapich2@2.3.7%intel@=19.1.2.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %intel@=19.1.2.gcc.10.3.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-19.1.2 - - spec: mvapich2@2.3.7%intel@=2021.6.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %intel@=2021.6.0 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0 - - spec: mvapich2@2.3.7%intel@=2021.6.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %intel@=2021.6.0.gcc.10.3.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-classic-2021.6.0 - - spec: mvapich2@2.3.7%intel@=2022.1.0 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %intel@=2022.1.0 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0 - - spec: mvapich2@2.3.7%intel@=2022.1.0.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %intel@=2022.1.0.gcc.10.3.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2022.1.0 - - spec: mvapich2@2.3.7%intel@=2023.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %intel@=2023.2.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1 - - spec: mvapich2@2.3.7%intel@=2023.2.1.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %intel@=2023.2.1.gcc.10.3.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-intel-2023.2.1 - - spec: mvapich2@2.3.7%clang@=14.0.6 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %clang@=14.0.6 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6 - - spec: mvapich2@2.3.7%clang@=14.0.6.gcc.10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %clang@=14.0.6.gcc.10.3.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-clang-14.0.6 - - spec: mvapich2@2.3.7%gcc@=10.3.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %gcc@=10.3.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-10.3.1 - - spec: mvapich2@2.3.7%gcc@=11.2.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %gcc@=11.2.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-11.2.1 - - spec: mvapich2@2.3.7%gcc@=12.1.1 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 - file_systems=lustre,nfs,ufs process_managers=slurm + - spec: mvapich2@2.3.7 ~cuda~debug~regcache~wrapperrpath ch3_rank_bits=32 + file_systems=lustre,nfs,ufs process_managers=slurm %gcc@=12.1.1 prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.7-gcc-12.1.1 python: buildable: false