From 955a3db20638ae50d902595829d6dc5d5d92a47c Mon Sep 17 00:00:00 2001 From: Stephen Hudson Date: Fri, 15 May 2020 08:14:06 -0500 Subject: py-petsc4py: allow ~mpi variant (#16595) Co-authored-by: Adam J. Stewart --- .../repos/builtin/packages/py-petsc4py/package.py | 29 ++++++++++++---------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/var/spack/repos/builtin/packages/py-petsc4py/package.py b/var/spack/repos/builtin/packages/py-petsc4py/package.py index 54653f9b68..c5fe8785e7 100644 --- a/var/spack/repos/builtin/packages/py-petsc4py/package.py +++ b/var/spack/repos/builtin/packages/py-petsc4py/package.py @@ -28,20 +28,23 @@ class PyPetsc4py(PythonPackage): version('3.8.0', sha256='b9b728e39245213cd8e74cf4724be9bb48bd295f99634135e37dbbdbec275244') version('3.7.0', sha256='fb78b50c596c3ba6a097751dd9a379e7acaf57edd36311a3afa94caa4312ee08') + variant('mpi', default=True, description='Activates MPI support') + depends_on('py-cython', type='build', when='@develop') depends_on('python@2.6:2.8,3.3:', type=('build', 'run')) depends_on('py-setuptools', type='build') depends_on('py-numpy', type=('build', 'run')) - depends_on('py-mpi4py', type=('build', 'run')) - - depends_on('petsc+mpi') - depends_on('petsc@develop+mpi', when='@develop') - depends_on('petsc@3.13:3.13.99+mpi', when='@3.13:3.13.99') - depends_on('petsc@3.12:3.12.99+mpi', when='@3.12:3.12.99') - depends_on('petsc@3.11:3.11.99+mpi', when='@3.11:3.11.99') - depends_on('petsc@3.10.3:3.10.99+mpi', when='@3.10.1:3.10.99') - depends_on('petsc@3.10:3.10.2+mpi', when='@3.10.0') - depends_on('petsc@3.9:3.9.99+mpi', when='@3.9:3.9.99') - depends_on('petsc@3.8:3.8.99+mpi', when='@3.8:3.8.99') - depends_on('petsc@3.7:3.7.99+mpi', when='@3.7:3.7.99') - depends_on('petsc@3.6:3.6.99+mpi', when='@3.6:3.6.99') + depends_on('py-mpi4py', when='+mpi', type=('build', 'run')) + + depends_on('petsc+mpi', when='+mpi') + depends_on('petsc~mpi', when='~mpi') + depends_on('petsc@develop', when='@develop') + depends_on('petsc@3.13:3.13.99', when='@3.13:3.13.99') + depends_on('petsc@3.12:3.12.99', when='@3.12:3.12.99') + depends_on('petsc@3.11:3.11.99', when='@3.11:3.11.99') + depends_on('petsc@3.10.3:3.10.99', when='@3.10.1:3.10.99') + depends_on('petsc@3.10:3.10.2', when='@3.10.0') + depends_on('petsc@3.9:3.9.99', when='@3.9:3.9.99') + depends_on('petsc@3.8:3.8.99', when='@3.8:3.8.99') + depends_on('petsc@3.7:3.7.99', when='@3.7:3.7.99') + depends_on('petsc@3.6:3.6.99', when='@3.6:3.6.99') -- cgit v1.2.3-70-g09d2