diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-06-26 22:35:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-26 22:35:39 -0700 |
| commit | 8b35940857d3ed5a3361c6097603cfd166c71da5 (patch) | |
| tree | 6a458e780de5d5a3fab2e260d87e5d6c618e84f7 | |
| parent | 30993357d730b9cf22292a2877e4f84a486c72b7 (diff) | |
| parent | 8921bf455215ebdf180136586a4fb25db501c8ef (diff) | |
| download | spack-8b35940857d3ed5a3361c6097603cfd166c71da5.tar.gz spack-8b35940857d3ed5a3361c6097603cfd166c71da5.tar.bz2 spack-8b35940857d3ed5a3361c6097603cfd166c71da5.tar.xz spack-8b35940857d3ed5a3361c6097603cfd166c71da5.zip | |
Merge pull request #1103 from adamjstewart/features/mpi
Add MPI environment variables to packages
| -rw-r--r-- | var/spack/repos/builtin/packages/mpich/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/mvapich2/package.py | 5 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/openmpi/package.py | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index ea1844aea0..90670ee517 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -50,6 +50,11 @@ class Mpich(Package): provides('mpi@:1.3', when='@1:') def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc')) + spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpic++')) + spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpif77')) + spack_env.set('MPIF90', join_path(self.prefix.bin, 'mpif90')) + spack_env.set('MPICH_CC', spack_cc) spack_env.set('MPICH_CXX', spack_cxx) spack_env.set('MPICH_F77', spack_f77) diff --git a/var/spack/repos/builtin/packages/mvapich2/package.py b/var/spack/repos/builtin/packages/mvapich2/package.py index 34bace10d6..da386445bb 100644 --- a/var/spack/repos/builtin/packages/mvapich2/package.py +++ b/var/spack/repos/builtin/packages/mvapich2/package.py @@ -191,6 +191,11 @@ class Mvapich2(Package): run_env.set('SLURM_MPI_TYPE', 'pmi2') def setup_dependent_environment(self, spack_env, run_env, extension_spec): + spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc')) + spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpicxx')) + spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpif77')) + spack_env.set('MPIF90', join_path(self.prefix.bin, 'mpif90')) + spack_env.set('MPICH_CC', spack_cc) spack_env.set('MPICH_CXX', spack_cxx) spack_env.set('MPICH_F77', spack_f77) diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 588d862d96..15c8eefe96 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -109,6 +109,11 @@ class Openmpi(Package): return "http://www.open-mpi.org/software/ompi/v%s/downloads/openmpi-%s.tar.bz2" % (version.up_to(2), version) # NOQA: ignore=E501 def setup_dependent_environment(self, spack_env, run_env, dependent_spec): + spack_env.set('MPICC', join_path(self.prefix.bin, 'mpicc')) + spack_env.set('MPICXX', join_path(self.prefix.bin, 'mpic++')) + spack_env.set('MPIF77', join_path(self.prefix.bin, 'mpif77')) + spack_env.set('MPIF90', join_path(self.prefix.bin, 'mpif90')) + spack_env.set('OMPI_CC', spack_cc) spack_env.set('OMPI_CXX', spack_cxx) spack_env.set('OMPI_FC', spack_fc) |