From 36272c813675c98864e7b9eda50e99ea800dfe21 Mon Sep 17 00:00:00 2001 From: David Beckingsale Date: Mon, 7 Dec 2015 14:58:16 -0800 Subject: Fix MPI selection in SAMRAI and remove narrow dependency specification --- var/spack/packages/SAMRAI/package.py | 7 ++----- var/spack/packages/cleverleaf/package.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'var') diff --git a/var/spack/packages/SAMRAI/package.py b/var/spack/packages/SAMRAI/package.py index f8caa1185c..a17aea9c99 100644 --- a/var/spack/packages/SAMRAI/package.py +++ b/var/spack/packages/SAMRAI/package.py @@ -33,13 +33,10 @@ class Samrai(Package): # TODO: currently hard-coded to use openmpi - be careful! def install(self, spec, prefix): - mpi = next(m for m in ('openmpi', 'mpich', 'mvapich') - if m in spec) - configure( "--prefix=%s" % prefix, - "--with-CXX=%s" % spec[mpi].prefix.bin + "/mpic++", - "--with-CC=%s" % spec[mpi].prefix.bin + "/mpicc", + "--with-CXX=%s" % spec['mpi'].prefix.bin + "/mpic++", + "--with-CC=%s" % spec['mpi'].prefix.bin + "/mpicc", "--with-hdf5=%s" % spec['hdf5'].prefix, "--with-boost=%s" % spec['boost'].prefix, "--with-zlib=%s" % spec['zlib'].prefix, diff --git a/var/spack/packages/cleverleaf/package.py b/var/spack/packages/cleverleaf/package.py index ad843ca412..4e7e6a855a 100644 --- a/var/spack/packages/cleverleaf/package.py +++ b/var/spack/packages/cleverleaf/package.py @@ -13,7 +13,7 @@ class Cleverleaf(Package): version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git', branch='develop') - depends_on("SAMRAI@3.8.0") + depends_on("SAMRAI@3.8.0:") depends_on("hdf5") depends_on("boost") -- cgit v1.2.3-60-g2f50