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

Fix MPI selection in SAMRAI and remove narrow dependency specification

Browse Source
This commit is contained in:
David Beckingsale 2015-12-07 14:58:16 -08:00
parent 77bf133cd2
commit 36272c8136
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
var/spack/packages/SAMRAI/package.py
View File

@ -33,13 +33,10 @@ class Samrai(Package):
# TODO: currently hard-coded to use openmpi - be careful! # TODO: currently hard-coded to use openmpi - be careful!
def install(self, spec, prefix): def install(self, spec, prefix):
mpi = next(m for m in ('openmpi', 'mpich', 'mvapich')
if m in spec)
configure( configure(
"--prefix=%s" % prefix, "--prefix=%s" % prefix,
"--with-CXX=%s" % spec[mpi].prefix.bin + "/mpic++", "--with-CXX=%s" % spec['mpi'].prefix.bin + "/mpic++",
"--with-CC=%s" % spec[mpi].prefix.bin + "/mpicc", "--with-CC=%s" % spec['mpi'].prefix.bin + "/mpicc",
"--with-hdf5=%s" % spec['hdf5'].prefix, "--with-hdf5=%s" % spec['hdf5'].prefix,
"--with-boost=%s" % spec['boost'].prefix, "--with-boost=%s" % spec['boost'].prefix,
"--with-zlib=%s" % spec['zlib'].prefix, "--with-zlib=%s" % spec['zlib'].prefix,

2
var/spack/packages/cleverleaf/package.py
View File

@ -13,7 +13,7 @@ class Cleverleaf(Package):
version('develop', git='https://github.com/UK-MAC/CleverLeaf_ref.git', branch='develop') 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("hdf5")
depends_on("boost") depends_on("boost")