summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pavel <rspavel@gmail.com>2018-05-14 19:29:03 -0600
committerAdam J. Stewart <ajstewart426@gmail.com>2018-05-14 20:29:03 -0500
commitb95660863186e78cdd05cf05d121d1be83468f50 (patch)
tree1fd5c92f4a93e7dd4d9a708a4944ac682f8f3afb
parent538d617d142ab672b1ee8385a2f422519f43fcec (diff)
downloadspack-b95660863186e78cdd05cf05d121d1be83468f50.tar.gz
spack-b95660863186e78cdd05cf05d121d1be83468f50.tar.bz2
spack-b95660863186e78cdd05cf05d121d1be83468f50.tar.xz
spack-b95660863186e78cdd05cf05d121d1be83468f50.zip
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
-rw-r--r--var/spack/repos/builtin/packages/silo/package.py10
1 files changed, 9 insertions, 1 deletions
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,