From c5b7eba45743ebd131233c035101a0e64bb0c1c7 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 16 Nov 2015 17:00:11 -0500 Subject: hdf5: make mpi support optional --- var/spack/packages/hdf5/package.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/packages/hdf5/package.py b/var/spack/packages/hdf5/package.py index 48997425cd..44d4ede278 100644 --- a/var/spack/packages/hdf5/package.py +++ b/var/spack/packages/hdf5/package.py @@ -15,19 +15,28 @@ class Hdf5(Package): version('1.8.15', '03cccb5b33dbe975fdcd8ae9dc021f24') version('1.8.13', 'c03426e9e77d7766944654280b467289') - depends_on("mpi") + variant('mpi', default=False, description='Enable MPI support') + + depends_on("mpi", when='+mpi') depends_on("zlib") # TODO: currently hard-coded to use OpenMPI def install(self, spec, prefix): + extra_args = [] + if '+mpi' in spec: + extra_args.extend([ + "--enable-parallel", + "CC=%s" % spec['mpich'].prefix.bin + "/mpicc", + "CXX=%s" % spec['mpich'].prefix.bin + "/mpic++", + ]) configure( "--prefix=%s" % prefix, "--with-zlib=%s" % spec['zlib'].prefix, - "--enable-parallel", "--enable-shared", "CC=%s" % spec['mpi'].prefix.bin + "/mpicc", - "CXX=%s" % spec['mpi'].prefix.bin + "/mpic++") + "CXX=%s" % spec['mpi'].prefix.bin + "/mpic++", + *extra_args) make() make("install") -- cgit v1.2.3-60-g2f50 From 79a641ccf16ee0bef0c32730c99b8513a88aa918 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Mon, 16 Nov 2015 17:01:01 -0500 Subject: paraview: update hdf5 comment --- var/spack/packages/paraview/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/packages/paraview/package.py b/var/spack/packages/paraview/package.py index b0893237e9..3bee5a1041 100644 --- a/var/spack/packages/paraview/package.py +++ b/var/spack/packages/paraview/package.py @@ -24,7 +24,7 @@ class Paraview(Package): depends_on('bzip2') depends_on('freetype') - depends_on('hdf5') # drags in mpi + depends_on('hdf5') depends_on('jpeg') depends_on('libpng') depends_on('libtiff') -- cgit v1.2.3-60-g2f50 From 6f978af77b7b98ca51e47bc8d3c097fe236e1491 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 10 Dec 2015 11:53:40 -0500 Subject: hdf5: update dependents to declare MPI support --- var/spack/packages/SAMRAI/package.py | 2 +- var/spack/packages/cleverleaf/package.py | 2 +- var/spack/packages/paraview/package.py | 1 + var/spack/packages/petsc/package.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/packages/SAMRAI/package.py b/var/spack/packages/SAMRAI/package.py index a17aea9c99..2c3b9180af 100644 --- a/var/spack/packages/SAMRAI/package.py +++ b/var/spack/packages/SAMRAI/package.py @@ -25,7 +25,7 @@ class Samrai(Package): depends_on("mpi") depends_on("zlib") - depends_on("hdf5") + depends_on("hdf5+mpi") depends_on("boost") # don't build tools with gcc diff --git a/var/spack/packages/cleverleaf/package.py b/var/spack/packages/cleverleaf/package.py index 4e7e6a855a..fb400b25c3 100644 --- a/var/spack/packages/cleverleaf/package.py +++ b/var/spack/packages/cleverleaf/package.py @@ -14,7 +14,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("hdf5") + depends_on("hdf5+mpi") depends_on("boost") def install(self, spec, prefix): diff --git a/var/spack/packages/paraview/package.py b/var/spack/packages/paraview/package.py index 3bee5a1041..1d99b34899 100644 --- a/var/spack/packages/paraview/package.py +++ b/var/spack/packages/paraview/package.py @@ -25,6 +25,7 @@ class Paraview(Package): depends_on('bzip2') depends_on('freetype') depends_on('hdf5') + depends_on('hdf5+mpi', when='+mpi') depends_on('jpeg') depends_on('libpng') depends_on('libtiff') diff --git a/var/spack/packages/petsc/package.py b/var/spack/packages/petsc/package.py index 4864e39bf1..f3ed3d72ec 100644 --- a/var/spack/packages/petsc/package.py +++ b/var/spack/packages/petsc/package.py @@ -18,7 +18,7 @@ class Petsc(Package): depends_on("hypre") depends_on("parmetis") depends_on("metis") - depends_on("hdf5") + depends_on("hdf5+mpi") depends_on("mpi") def install(self, spec, prefix): -- cgit v1.2.3-60-g2f50