diff options
| author | Matthew LeGendre <legendre1@llnl.gov> | 2015-09-16 10:56:11 -0700 |
|---|---|---|
| committer | Matthew LeGendre <legendre1@llnl.gov> | 2015-10-05 11:37:36 -0700 |
| commit | 650c9d4e36c6a58cf6bca0e6abd580ee54d8e175 (patch) | |
| tree | bc82163f8dcb0a6e36d20295edc620eb17575ad4 /var | |
| parent | 53d70fff0121a05fb21c02363570f81573bbeffa (diff) | |
| download | spack-650c9d4e36c6a58cf6bca0e6abd580ee54d8e175.tar.gz spack-650c9d4e36c6a58cf6bca0e6abd580ee54d8e175.tar.bz2 spack-650c9d4e36c6a58cf6bca0e6abd580ee54d8e175.tar.xz spack-650c9d4e36c6a58cf6bca0e6abd580ee54d8e175.zip | |
Allow spack to build against external non-spack-installed packages.
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/packages/mpich/package.py | 1 | ||||
| -rw-r--r-- | var/spack/packages/mvapich2/package.py | 17 |
2 files changed, 16 insertions, 2 deletions
diff --git a/var/spack/packages/mpich/package.py b/var/spack/packages/mpich/package.py index b6b2dfde21..dfff22152d 100644 --- a/var/spack/packages/mpich/package.py +++ b/var/spack/packages/mpich/package.py @@ -45,6 +45,7 @@ class Mpich(Package): os.environ['MPICH_F77'] = 'f77' os.environ['MPICH_F90'] = 'f90' + module.mpicc = join_path(self.prefix.bin, 'mpicc') def install(self, spec, prefix): config_args = ["--prefix=" + prefix, diff --git a/var/spack/packages/mvapich2/package.py b/var/spack/packages/mvapich2/package.py index ca0b1287c1..93bce011b7 100644 --- a/var/spack/packages/mvapich2/package.py +++ b/var/spack/packages/mvapich2/package.py @@ -11,10 +11,17 @@ class Mvapich2(Package): version('2.0', '9fbb68a4111a8b6338e476dc657388b4', url='http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.0.tar.gz') + + version('2.1', '0095ceecb19bbb7fb262131cb9c2cdd6', + url='http://mvapich.cse.ohio-state.edu/download/mvapich/mv2/mvapich2-2.1.tar.gz') provides('mpi@:2.2', when='@1.9') # MVAPICH2-1.9 supports MPI 2.2 provides('mpi@:3.0', when='@2.0') # MVAPICH2-2.0 supports MPI 3.0 + variant('psm', default=False, description="build with psm") + + variant('pmi', default=False, description="build with pmi") + depends_on('pmgr_collective', when='+pmi') def install(self, spec, prefix): # we'll set different configure flags depending on our environment @@ -80,7 +87,13 @@ class Mvapich2(Package): configure_args.append("--with-device=ch3:psm") else: # throw this flag on IB systems - configure_args.append("--with-device=ch3:mrail", "--with-rdma=gen2") + configure_args.append("--with-device=ch3:mrail") + configure_args.append("--with-rdma=gen2") + + if "+pmi" in spec: + configure_args.append("--with-pmi=pmgr_collective" % spec['pmgr_collective'].prefix) + else: + configure_args.append("--with-pmi=slurm") # TODO: shared-memory build @@ -93,7 +106,7 @@ class Mvapich2(Package): "--enable-f77", "--enable-fc", "--enable-cxx", "--enable-shared", "--enable-sharedlibs=gcc", "--enable-debuginfo", - "--with-pm=no", "--with-pmi=slurm", + "--with-pm=no", "--enable-romio", "--with-file-system=lustre+nfs+ufs", "--disable-mpe", "--without-mpe", "--disable-silent-rules", |