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

Merge branch 'openmpi_variants' of github.com:epfl-scitas/spack into openmpi_variants

Browse Source 
Conflicts:
	var/spack/repos/builtin/packages/openmpi/package.py
This commit is contained in:
alalazo 2016-05-09 10:56:26 +02:00
commit 3d7684277a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/openmpi/package.py
View File

@ -58,6 +58,12 @@ def setup_dependent_environment(self, spack_env, run_env, dependent_spec):
spack_env.set('OMPI_FC', spack_fc) spack_env.set('OMPI_FC', spack_fc)
spack_env.set('OMPI_F77', spack_f77) spack_env.set('OMPI_F77', spack_f77)
def setup_dependent_package(self, module, dep_spec):
self.spec.mpicc = join_path(self.prefix.bin, 'mpicc')
self.spec.mpicxx = join_path(self.prefix.bin, 'mpic++')
self.spec.mpifc = join_path(self.prefix.bin, 'mpif90')
self.spec.mpif77 = join_path(self.prefix.bin, 'mpif77')
@property @property
def verbs(self): def verbs(self):
# Up through version 1.6, this option was previously named --with-openib # Up through version 1.6, this option was previously named --with-openib
@ -67,13 +73,6 @@ def verbs(self):
elif self.spec.satisfies('@1.7:'): elif self.spec.satisfies('@1.7:'):
return 'verbs' return 'verbs'
def setup_dependent_package(self, module, dep_spec):
self.spec.mpicc = join_path(self.prefix.bin, 'mpicc')
self.spec.mpicxx = join_path(self.prefix.bin, 'mpic++')
self.spec.mpifc = join_path(self.prefix.bin, 'mpif90')
self.spec.mpif77 = join_path(self.prefix.bin, 'mpif77')
def install(self, spec, prefix): def install(self, spec, prefix):
config_args = ["--prefix=%s" % prefix, config_args = ["--prefix=%s" % prefix,
"--with-hwloc=%s" % spec['hwloc'].prefix, "--with-hwloc=%s" % spec['hwloc'].prefix,