Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spack v1.0 support: %foo +bar -> +bar %foo #1522

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scripts/spack/configs/toss_4_x86_64_ib/spack.yaml
Original file line number Diff line number Diff line change
@@ -121,11 +121,11 @@ spack:
mvapich2:
buildable: false
externals:
- spec: [email protected]%[email protected]~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple
- spec: [email protected]~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple %[email protected]
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-clang-14.0.6
- spec: [email protected]%[email protected]~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple
- spec: [email protected]~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple %[email protected]
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1
- spec: [email protected]%[email protected]~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple
- spec: [email protected]~alloca~cuda~debug~hwloc_graphics~hwlocv2+regcache+wrapperrpath build_system=autotools ch3_rank_bits=32 fabrics=mrail file_systems=auto process_managers=slurm threads=multiple %[email protected]
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-intel-2022.1.0

netlib-lapack:
16 changes: 8 additions & 8 deletions scripts/spack/configs/toss_4_x86_64_ib_cray/spack.yaml
Original file line number Diff line number Diff line change
@@ -273,21 +273,21 @@ spack:
cray-mpich:
buildable: false
externals:
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.16-rocmcc-5.2.3/
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3/
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.6.0/
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.27-rocmcc-5.7.1/
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.29-rocmcc-6.1.2/
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.29-rocmcc-6.2.1/
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.25-rocmcc-5.4.3-cce-15.0.1/
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.29-rocmcc-6.1.2-cce-18.0.0/

# blas is a bit more complicated because its a virtual package so fake it with
2 changes: 1 addition & 1 deletion scripts/spack/devtools_configs/toss_4_x86_64_ib/spack.yaml
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ spack:
mvapich2:
buildable: false
externals:
- spec: [email protected]%[email protected] process_managers=slurm arch=linux-rhel8-ivybridge
- spec: [email protected] process_managers=slurm arch=linux-rhel8-ivybridge %[email protected]
prefix: /usr/tce/packages/mvapich2/mvapich2-2.3.6-gcc-10.3.1

netlib-lapack:
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ spack:
cray-mpich:
buildable: false
externals:
- spec: [email protected]%[email protected]+slurm
- spec: [email protected]+slurm %[email protected]
prefix: /usr/tce/packages/cray-mpich-tce/cray-mpich-8.1.29-gcc-10.3.1/

# blas is a bit more complicated because its a virtual package so fake it with