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

Merge pull request #221 from davidbeckingsale/features/cleverleaf-boost

Browse Source 
Update CleverLeaf package to use Boost and fix SAMRAI MPI usage
This commit is contained in:
Todd Gamblin
2015-12-07 16:46:15 -08:00
parent fcabf0ef0d 36272c8136
commit b0434fa486
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,11 +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-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,

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

@@ -13,7 +13,9 @@ 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("boost")
def install(self, spec, prefix): def install(self, spec, prefix):
cmake(*std_cmake_args) cmake(*std_cmake_args)