zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #756 from epfl-scitas/fixes/mpi_small_fixes

Browse Source 
fix : mpich and mvapich2 will use spack compilers during installation
This commit is contained in:
Todd Gamblin
2016-04-06 15:35:34 -07:00
parent 3c8e055ed0 c113d390a7
commit d62766a94d
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/mpich/package.py
View File

@@ -47,12 +47,12 @@ class Mpich(Package):
provides('mpi@:3.0', when='@3:') provides('mpi@:3.0', when='@3:')
provides('mpi@:1.3', when='@1:') provides('mpi@:1.3', when='@1:')
def setup_dependent_environment(self, env, dependent_spec): def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
env.set('MPICH_CC', spack_cc) spack_env.set('MPICH_CC', spack_cc)
env.set('MPICH_CXX', spack_cxx) spack_env.set('MPICH_CXX', spack_cxx)
env.set('MPICH_F77', spack_f77) spack_env.set('MPICH_F77', spack_f77)
env.set('MPICH_F90', spack_f90) spack_env.set('MPICH_F90', spack_fc)
env.set('MPICH_FC', spack_fc) spack_env.set('MPICH_FC', spack_fc)
def setup_dependent_package(self, module, dep_spec): def setup_dependent_package(self, module, dep_spec):
"""For dependencies, make mpicc's use spack wrapper.""" """For dependencies, make mpicc's use spack wrapper."""

7
var/spack/repos/builtin/packages/mvapich2/package.py
View File

@@ -140,6 +140,13 @@ def set_network_type(self, spec, configure_args):
configure_args.extend(network_options) configure_args.extend(network_options)
def setup_dependent_environment(self, spack_env, run_env, extension_spec):
spack_env.set('MPICH_CC', spack_cc)
spack_env.set('MPICH_CXX', spack_cxx)
spack_env.set('MPICH_F77', spack_f77)
spack_env.set('MPICH_F90', spack_fc)
spack_env.set('MPICH_FC', spack_fc)
def install(self, spec, prefix): def install(self, spec, prefix):
# we'll set different configure flags depending on our environment # we'll set different configure flags depending on our environment
configure_args = [ configure_args = [