diff options
| author | kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> | 2021-08-20 07:03:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-20 14:03:37 +0200 |
| commit | 9b239392b152d4ac5671a58af83f9171c6f0106f (patch) | |
| tree | e1442c55eb3f76214e7700803c50b1aab890ebfa | |
| parent | 05e933d7af51bc8035e86ee941f7dfe44c34ccd5 (diff) | |
| download | spack-9b239392b152d4ac5671a58af83f9171c6f0106f.tar.gz spack-9b239392b152d4ac5671a58af83f9171c6f0106f.tar.bz2 spack-9b239392b152d4ac5671a58af83f9171c6f0106f.tar.xz spack-9b239392b152d4ac5671a58af83f9171c6f0106f.zip | |
Add MPI variant and fix python3 variant for cinema (#25513)
| -rw-r--r-- | var/spack/repos/builtin/packages/py-cinema-lib/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-cinemasci/package.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/py-cinema-lib/package.py b/var/spack/repos/builtin/packages/py-cinema-lib/package.py index 9e5e1fd30c..d8d4b97623 100644 --- a/var/spack/repos/builtin/packages/py-cinema-lib/package.py +++ b/var/spack/repos/builtin/packages/py-cinema-lib/package.py @@ -37,5 +37,5 @@ class PyCinemaLib(PythonPackage): depends_on('py-numpy@1.13:', when='+opencv', type=('build', 'run')) depends_on('py-scikit-image@0.13.1:', when='+image', 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')) diff --git a/var/spack/repos/builtin/packages/py-cinemasci/package.py b/var/spack/repos/builtin/packages/py-cinemasci/package.py index 83ddb8b648..3f70f82850 100644 --- a/var/spack/repos/builtin/packages/py-cinemasci/package.py +++ b/var/spack/repos/builtin/packages/py-cinemasci/package.py @@ -17,10 +17,14 @@ class PyCinemasci(PythonPackage): 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('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-jupyterlab', type=('build', 'run')) depends_on('py-pandas', type=('build', 'run')) |