Merge pull request #1103 from adamjstewart/features/mpi
Add MPI environment variables to packages
This commit is contained in:
commit
8b35940857
3 changed files with 15 additions and 0 deletions
|
@ -50,6 +50,11 @@ class Mpich(Package):
|
||||||
provides('mpi@:1.3', when='@1:')
|
provides('mpi@:1.3', when='@1:')
|
||||||
|
|
||||||
def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
|
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_CC', spack_cc)
|
||||||
spack_env.set('MPICH_CXX', spack_cxx)
|
spack_env.set('MPICH_CXX', spack_cxx)
|
||||||
spack_env.set('MPICH_F77', spack_f77)
|
spack_env.set('MPICH_F77', spack_f77)
|
||||||
|
|
|
@ -191,6 +191,11 @@ def setup_environment(self, spack_env, run_env):
|
||||||
run_env.set('SLURM_MPI_TYPE', 'pmi2')
|
run_env.set('SLURM_MPI_TYPE', 'pmi2')
|
||||||
|
|
||||||
def setup_dependent_environment(self, spack_env, run_env, extension_spec):
|
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_CC', spack_cc)
|
||||||
spack_env.set('MPICH_CXX', spack_cxx)
|
spack_env.set('MPICH_CXX', spack_cxx)
|
||||||
spack_env.set('MPICH_F77', spack_f77)
|
spack_env.set('MPICH_F77', spack_f77)
|
||||||
|
|
|
@ -109,6 +109,11 @@ def url_for_version(self, version):
|
||||||
return "http://www.open-mpi.org/software/ompi/v%s/downloads/openmpi-%s.tar.bz2" % (version.up_to(2), version) # NOQA: ignore=E501
|
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):
|
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_CC', spack_cc)
|
||||||
spack_env.set('OMPI_CXX', spack_cxx)
|
spack_env.set('OMPI_CXX', spack_cxx)
|
||||||
spack_env.set('OMPI_FC', spack_fc)
|
spack_env.set('OMPI_FC', spack_fc)
|
||||||
|
|
Loading…
Reference in a new issue