diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-05-09 10:56:26 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-05-09 10:56:26 +0200 |
| commit | 3d7684277a90760cc14b2140fc862dd119045be7 (patch) | |
| tree | 9df845a6319943f2fcda0f2cc008fb892020c6e0 /var | |
| parent | 497ed9f933f1ce50beca9e03f478aaa6cca836d9 (diff) | |
| parent | 7d5bb088b424012372064cba76a2472943dd7db7 (diff) | |
| download | spack-3d7684277a90760cc14b2140fc862dd119045be7.tar.gz spack-3d7684277a90760cc14b2140fc862dd119045be7.tar.bz2 spack-3d7684277a90760cc14b2140fc862dd119045be7.tar.xz spack-3d7684277a90760cc14b2140fc862dd119045be7.zip | |
Merge branch 'openmpi_variants' of github.com:epfl-scitas/spack into openmpi_variants
Conflicts:
var/spack/repos/builtin/packages/openmpi/package.py
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/openmpi/package.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index f609dd7863..042f072226 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -58,6 +58,12 @@ class Openmpi(Package): spack_env.set('OMPI_FC', spack_fc) 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 def verbs(self): # Up through version 1.6, this option was previously named --with-openib @@ -67,13 +73,6 @@ class Openmpi(Package): elif self.spec.satisfies('@1.7:'): 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): config_args = ["--prefix=%s" % prefix, "--with-hwloc=%s" % spec['hwloc'].prefix, |