Add MPI variant and fix python3 variant for cinema (#25513)
This commit is contained in:
parent
05e933d7af
commit
9b239392b1
2 changed files with 7 additions and 3 deletions
|
@ -37,5 +37,5 @@ class PyCinemaLib(PythonPackage):
|
||||||
depends_on('py-numpy@1.13:', when='+opencv', type=('build', 'run'))
|
depends_on('py-numpy@1.13:', when='+opencv', type=('build', 'run'))
|
||||||
depends_on('py-scikit-image@0.13.1:', when='+image',
|
depends_on('py-scikit-image@0.13.1:', when='+image',
|
||||||
type=('build', 'run'))
|
type=('build', 'run'))
|
||||||
depends_on('opencv@3.4:+python', when='+opencv', type=('build', 'run'))
|
depends_on('opencv@3.4:+python3', when='+opencv', type=('build', 'run'))
|
||||||
depends_on('py-setuptools', type=('build', 'run'))
|
depends_on('py-setuptools', type=('build', 'run'))
|
||||||
|
|
|
@ -17,10 +17,14 @@ class PyCinemasci(PythonPackage):
|
||||||
|
|
||||||
version('1.3', sha256='c024ca9791de9d78e5dad3fd11e8f87d8bc1afa5830f2697d7ec4116a5d23c20')
|
version('1.3', sha256='c024ca9791de9d78e5dad3fd11e8f87d8bc1afa5830f2697d7ec4116a5d23c20')
|
||||||
|
|
||||||
depends_on('hdf5~mpi')
|
variant('mpi', default=False, description='Enable MPI')
|
||||||
|
|
||||||
|
depends_on('hdf5 ~mpi', when='~mpi')
|
||||||
|
depends_on('hdf5 +mpi', when='+mpi')
|
||||||
depends_on('pil', type=('build', 'run'))
|
depends_on('pil', type=('build', 'run'))
|
||||||
depends_on('python@3:', type=('build', 'run'))
|
depends_on('python@3:', type=('build', 'run'))
|
||||||
depends_on('py-h5py~mpi', type=('build', 'run'))
|
depends_on('py-h5py~mpi', when='~mpi', type=('build', 'run'))
|
||||||
|
depends_on('py-h5py+mpi', when='+mpi', type=('build', 'run'))
|
||||||
depends_on('py-ipywidgets', type=('build', 'run'))
|
depends_on('py-ipywidgets', type=('build', 'run'))
|
||||||
depends_on('py-jupyterlab', type=('build', 'run'))
|
depends_on('py-jupyterlab', type=('build', 'run'))
|
||||||
depends_on('py-pandas', type=('build', 'run'))
|
depends_on('py-pandas', type=('build', 'run'))
|
||||||
|
|
Loading…
Reference in a new issue