Skip to content

Commit c229b20

Browse files
authored
Merge pull request #227 from xylar/add-gcc-extra-attributes
Add `extra_attributes` to all external gcc spack packages
2 parents bb9badf + 52321b1 commit c229b20

12 files changed

+50
-5
lines changed

mache/spack/anvil_gnu_mvapich.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spack:
9090
zlib:
9191
externals:
9292
93-
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
93+
prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
9494
buildable: false
9595
perl:
9696
externals:
@@ -105,6 +105,11 @@ spack:
105105
prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33
106106
modules:
107107
- gcc/8.2.0-xhxgy33
108+
extra_attributes:
109+
compilers:
110+
c: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gcc
111+
cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/g++
112+
fortran: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gfortran
108113
buildable: false
109114
mvapich2:
110115
externals:

mache/spack/anvil_gnu_openmpi.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spack:
9090
zlib:
9191
externals:
9292
93-
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
93+
prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
9494
buildable: false
9595
perl:
9696
externals:
@@ -105,6 +105,11 @@ spack:
105105
prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33
106106
modules:
107107
- gcc/8.2.0-xhxgy33
108+
extra_attributes:
109+
compilers:
110+
c: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gcc
111+
cxx: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/g++
112+
fortran: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/gcc-8.2.0-xhxgy33/bin/gfortran
108113
buildable: false
109114
openmpi:
110115
externals:

mache/spack/anvil_intel_impi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spack:
9090
zlib:
9191
externals:
9292
93-
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
93+
prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
9494
buildable: false
9595
perl:
9696
externals:

mache/spack/anvil_intel_mvapich.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spack:
9090
zlib:
9191
externals:
9292
93-
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
93+
prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
9494
buildable: false
9595
perl:
9696
externals:

mache/spack/anvil_intel_openmpi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ spack:
9090
zlib:
9191
externals:
9292
93-
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/intel-20.0.4/zlib-1.2.11-dudhhig
93+
prefix: /gpfs/fs1/software/centos7/spack-latest/opt/spack/linux-centos7-x86_64/gcc-6.5.0/zlib-1.2.11-m3ugpb3
9494
buildable: false
9595
perl:
9696
externals:

mache/spack/chicoma-cpu_gnu_mpich.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ spack:
101101
- craype/2.7.30
102102
- craype-accel-host
103103
- craype-x86-rome
104+
extra_attributes:
105+
compilers:
106+
c: cc
107+
cxx: CC
108+
fortran: ftn
104109
buildable: false
105110
cray-mpich:
106111
externals:

mache/spack/chrysalis_gnu_openmpi.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ spack:
9090
prefix: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-11.2.0-bgddrif
9191
modules:
9292
- gcc/11.2.0-bgddrif
93+
extra_attributes:
94+
compilers:
95+
c: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-11.2.0-bgddrif/bin/gcc
96+
cxx: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-11.2.0-bgddrif/bin/g++
97+
fortran: /gpfs/fs1/soft/chrysalis/spack/opt/spack/linux-centos8-x86_64/gcc-9.3.0/gcc-11.2.0-bgddrif/bin/gfortran
9398
buildable: false
9499
openmpi:
95100
externals:

mache/spack/compy_gnu_openmpi.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ spack:
103103
prefix: /share/apps/gcc/10.2.0
104104
modules:
105105
- gcc/10.2.0
106+
extra_attributes:
107+
compilers:
108+
c: /share/apps/gcc/10.2.0/bin/gcc
109+
cxx: /share/apps/gcc/10.2.0/bin/g++
110+
fortran: /share/apps/gcc/10.2.0/bin/gfortran
106111
buildable: false
107112
openmpi:
108113
externals:

mache/spack/frontier_gnu_mpich.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ spack:
107107
- gcc/12.2.0
108108
- craype/2.7.19
109109
- libfabric/1.15.2.0
110+
extra_attributes:
111+
compilers:
112+
c: cc
113+
cxx: CC
114+
fortran: ftn
110115
buildable: false
111116
cray-mpich:
112117
externals:

mache/spack/frontier_gnugpu_mpich.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ spack:
107107
- gcc/11.2.0
108108
- craype/2.7.19
109109
- libfabric/1.15.2.0
110+
extra_attributes:
111+
compilers:
112+
c: cc
113+
cxx: CC
114+
fortran: ftn
110115
buildable: false
111116
cray-mpich:
112117
externals:

0 commit comments

Comments
 (0)