diff options
| author | lukebroskop <luke.roskop@hpe.com> | 2021-08-25 01:50:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 23:50:02 -0700 |
| commit | f6a9ef5ef51630969635f9068e3420dd4dadc86f (patch) | |
| tree | 36ac325a508b0c25d2c77c1575cf4b0fe20dfd60 | |
| parent | df10e88e978ea1057401c56e7108dd271ae3151a (diff) | |
| download | spack-f6a9ef5ef51630969635f9068e3420dd4dadc86f.tar.gz spack-f6a9ef5ef51630969635f9068e3420dd4dadc86f.tar.bz2 spack-f6a9ef5ef51630969635f9068e3420dd4dadc86f.tar.xz spack-f6a9ef5ef51630969635f9068e3420dd4dadc86f.zip | |
Update the cray-mpich package to use the new cray-mpich MPI wrappers (#25597)
As of cray-mpich version 8.1.7, conventional MPI compiler wrappers are included in cray-mpich.
Co-authored-by: Luke Roskop <lroskop@cedar.head.cm.us.cray.com>
| -rw-r--r-- | var/spack/repos/builtin/packages/cray-mpich/package.py | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/var/spack/repos/builtin/packages/cray-mpich/package.py b/var/spack/repos/builtin/packages/cray-mpich/package.py index 98f9962cea..fd7f253562 100644 --- a/var/spack/repos/builtin/packages/cray-mpich/package.py +++ b/var/spack/repos/builtin/packages/cray-mpich/package.py @@ -18,6 +18,7 @@ class CrayMpich(Package): maintainers = ['haampie'] + version('8.1.7') version('8.1.0') version('8.0.16') version('8.0.14') @@ -58,14 +59,20 @@ class CrayMpich(Package): return os.path.dirname(os.path.normpath(libdir)) def setup_run_environment(self, env): - env.set('MPICC', spack_cc) - env.set('MPICXX', spack_cxx) - env.set('MPIF77', spack_fc) - env.set('MPIF90', spack_fc) + if(self.spec.satisfies('@:8.1.6')): + env.set('MPICC', spack_cc) + env.set('MPICXX', spack_cxx) + env.set('MPIF77', spack_fc) + env.set('MPIF90', spack_fc) + else: + # cray-mpich 8.1.7: features MPI compiler wrappers + env.set('MPICC', join_path(self.prefix.bin, 'mpicc')) + env.set('MPICXX', join_path(self.prefix.bin, 'mpicxx')) + env.set('MPIF77', join_path(self.prefix.bin, 'mpif77')) + env.set('MPIF90', join_path(self.prefix.bin, 'mpif90')) def setup_dependent_build_environment(self, env, dependent_spec): self.setup_run_environment(env) - env.set('MPICH_CC', spack_cc) env.set('MPICH_CXX', spack_cxx) env.set('MPICH_F77', spack_f77) @@ -74,10 +81,17 @@ class CrayMpich(Package): def setup_dependent_package(self, module, dependent_spec): spec = self.spec - spec.mpicc = spack_cc - spec.mpicxx = spack_cxx - spec.mpifc = spack_fc - spec.mpif77 = spack_f77 + if(spec.satisfies('@:8.1.6')): + spec.mpicc = spack_cc + spec.mpicxx = spack_cxx + spec.mpifc = spack_fc + spec.mpif77 = spack_f77 + else: + # cray-mpich 8.1.7: features MPI compiler wrappers + spec.mpicc = join_path(self.prefix.bin, 'mpicc') + spec.mpicxx = join_path(self.prefix.bin, 'mpicxx') + spec.mpifc = join_path(self.prefix.bin, 'mpif90') + spec.mpif77 = join_path(self.prefix.bin, 'mpif77') def install(self, spec, prefix): raise InstallError( |