diff options
| author | Seth R. Johnson <johnsonsr@ornl.gov> | 2021-05-03 09:00:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-03 09:00:08 -0400 |
| commit | d3d3b9761663bd82f10105c4512db55b82175838 (patch) | |
| tree | eeb4539714d701242ae6c73b0a9ac1d4b27819ba | |
| parent | f62b8077ab67557780da0d39c581e8bc8d49c324 (diff) | |
| download | spack-d3d3b9761663bd82f10105c4512db55b82175838.tar.gz spack-d3d3b9761663bd82f10105c4512db55b82175838.tar.bz2 spack-d3d3b9761663bd82f10105c4512db55b82175838.tar.xz spack-d3d3b9761663bd82f10105c4512db55b82175838.zip | |
py-hdf5: restore py-h5py~mpi ^hdf5+mpi (#23386)
* Revert "py-tensorflow: disable h5py/hdf5 mpi variant(s) if tensorflow is ~mpi (#21955)"
This reverts commit 8071be81c4cef38d54814b6f1a348c318b86d2b6.
* Restore mpi restrictions to py-tensorflow
| -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 | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py index 56c2960fc2..a1351d4797 100644 --- a/var/spack/repos/builtin/packages/py-h5py/package.py +++ b/var/spack/repos/builtin/packages/py-h5py/package.py @@ -59,7 +59,6 @@ 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='@:2.99 +mpi', type=('build', 'run')) depends_on('py-mpi4py@3.0.0:', when='@3.0.0:+mpi^python@3.0.0:3.7.99', 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 e5dd80401d..2833630e44 100644 --- a/var/spack/repos/builtin/packages/py-tensorflow/package.py +++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py @@ -157,7 +157,10 @@ class PyTensorflow(Package, CudaPackage): depends_on('py-google-pasta@0.1.2:', type=('build', 'run'), when='@1.12.1') # 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-h5py+mpi', type=('build', 'run'), when='@2.2:+mpi') + depends_on('py-h5py~mpi', type=('build', 'run'), when='@2.2:~mpi') + depends_on('hdf5+mpi', type='build', when='@2.2:+mpi') + depends_on('hdf5~mpi', type='build', 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') |