diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/py-h5py/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-tensorflow/package.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 384eb4f059..e2482cb65c 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -49,6 +49,7 @@ class PyH5py(PythonPackage): # MPI dependencies depends_on('hdf5+mpi', when='+mpi') + depends_on('hdf5~mpi', when='~mpi') depends_on('mpi', when='+mpi') depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py index 73dafed353..d43f26e96b 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -155,7 +155,9 @@ class PyTensorflow(Package, CudaPackage): depends_on('py-google-pasta@0.1.8:', type=('build', 'run'), when='@2.1:2.3') depends_on('py-google-pasta@0.1.6:', type=('build', 'run'), when='@1.14:2.0') depends_on('py-google-pasta@0.1.2:', type=('build', 'run'), when='@1.12.1') - depends_on('py-h5py@2.10.0:2.10.999', type=('build', 'run'), when='@2.2:') + # propagate the mpi variant setting for h5py/hdf5 to avoid unexpected crashes + depends_on('py-h5py@2.10.0:2.10.999', type=('build', 'run'), when='@2.2:+mpi') + depends_on('py-h5py~mpi@2.10.0:2.10.999', type=('build', 'run'), when='@2.2:~mpi') depends_on('py-keras-applications@1.0.8:', type=('build', 'run'), when='@1.15:2.1') depends_on('py-keras-applications@1.0.6:', type=('build', 'run'), when='@1.12:1.14') depends_on('py-keras-applications@1.0.5:', type=('build', 'run'), when='@1.11.0:1.11.999') |