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

py-hdf5: restore py-h5py~mpi ^hdf5+mpi (#23386)

Browse Source 
* Revert "py-tensorflow: disable h5py/hdf5 mpi variant(s) if tensorflow is ~mpi (#21955)"

This reverts commit 8071be81c4.

* Restore mpi restrictions to py-tensorflow
This commit is contained in:
Seth R. Johnson 2021-05-03 09:00:08 -04:00 committed by GitHub
parent f62b8077ab
commit d3d3b97616
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
var/spack/repos/builtin/packages/py-h5py/package.py
View File

@ -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'))

5
var/spack/repos/builtin/packages/py-tensorflow/package.py
View File

@ -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')