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

Quantum ESPRESSO package: Serial HDF5 Bug Fix (#10689)

Browse Source 
Serial HDF5 in serial QE only works in develop version. This adds
a conflict to the QE package to prevent Spack from trying to build
specs which don't satisfy this constraint.
This commit is contained in:
Nichols A. Romero 2019-02-26 18:36:50 -06:00 committed by Peter Scheibel
parent 42386dbe94
commit 5aa6cbf437
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
var/spack/repos/builtin/packages/quantum-espresso/package.py
View File

@ -88,6 +88,12 @@ class QuantumEspresso(Package):
msg='parallel HDF5 requires MPI support'
)
conflicts(
'hdf5=serial',
when='~mpi @6.1:6.3',
msg='serial HDF5 in serial QE only works in develop version'
)
# Elpa is formally supported by @:5.4.0, but QE configure searches
# for it in the wrong folders (or tries to download it within
# the build directory). Instead of patching Elpa to provide the
@ -194,7 +200,7 @@ def install(self, spec, prefix):
'--with-elpa-lib={0}'.format(elpa.libs[0])
])
if self.spec.variants['hdf5'].value != 'none':
if spec.variants['hdf5'].value != 'none':
options.append('--with-hdf5={0}'.format(spec['hdf5'].prefix))
configure(*options)
@ -210,13 +216,13 @@ def install(self, spec, prefix):
#
# Below we try to match the entire HDF5_LIB line and substitute
# with the list of libraries that needs to be linked.
if self.spec.variants['hdf5'].value != 'none':
if spec.variants['hdf5'].value != 'none':
make_inc = join_path(self.stage.source_path, 'make.inc')
hdf5_libs = ' '.join(spec['hdf5:hl,fortran'].libs)
filter_file(r'HDF5_LIB([\s]*)=([\s\w\-\/.,]*)',
'HDF5_LIB = {0}'.format(hdf5_libs),
make_inc)
if self.spec.variants['hdf5'].value == 'serial':
if spec.variants['hdf5'].value == 'serial':
# Note that there is a benign side effect with this filter
# file statement. It replaces an instance of MANUAL_DFLAGS
# that is a comment in make.inc.