From b95660863186e78cdd05cf05d121d1be83468f50 Mon Sep 17 00:00:00 2001 From: Robert Pavel Date: Mon, 14 May 2018 19:29:03 -0600 Subject: Added Shim to Support hdf5+mpi in Spack Silo (#8130) * Added Shim to Support hdf5+mpi in Spack Silo Added compatibility for hdf5+mpi to silo spackage to support spackages with dependency chains that include silo and hf5+mpi * Fixed fixable flake8 issue with silo spackage Fixed missing whitespace around operator * Setting MPI Variant to Default to True As per guidance changing variant to default to MPI builds --- var/spack/repos/builtin/packages/silo/package.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/silo/package.py b/var/spack/repos/builtin/packages/silo/package.py index a6fd19a7aa..add7b781bb 100644 --- a/var/spack/repos/builtin/packages/silo/package.py +++ b/var/spack/repos/builtin/packages/silo/package.py @@ -42,8 +42,11 @@ class Silo(Package): description='Builds Silex, a GUI for viewing Silo files') variant('pic', default=True, description='Produce position-independent code (for shared libs)') + variant('mpi', default=True, + description='Compile with MPI Compatibility') - depends_on('hdf5~mpi') + depends_on('hdf5~mpi', when='~mpi') + depends_on('hdf5+mpi', when='+mpi') depends_on('qt', when='+silex') patch('remove-mpiposix.patch', when='@4.8:4.10.2') @@ -69,6 +72,11 @@ class Silo(Package): 'CXXFLAGS={0}'.format(self.compiler.pic_flag), 'FCFLAGS={0}'.format(self.compiler.pic_flag)] + if '+mpi' in spec: + config_args.append('CC=%s' % spec['mpi'].mpicc) + config_args.append('CXX=%s' % spec['mpi'].mpicxx) + config_args.append('FC=%s' % spec['mpi'].mpifc) + configure( '--prefix=%s' % prefix, '--with-hdf5=%s,%s' % (spec['hdf5'].prefix.include, -- cgit v1.2.3-70-g09d2