From 0197b364a2f93e053fee9d94220de243cf38406d Mon Sep 17 00:00:00 2001 From: Olivier Cessenat Date: Mon, 20 Sep 2021 18:51:29 +0200 Subject: mfem and petsc: alter hypre dependencies (#25902) Hypre latest version 2.22.1 breaks MFEM and PETSc. --- var/spack/repos/builtin/packages/mfem/package.py | 3 ++- var/spack/repos/builtin/packages/petsc/package.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/var/spack/repos/builtin/packages/mfem/package.py b/var/spack/repos/builtin/packages/mfem/package.py index 6f51ee9dad..27fcac8d67 100644 --- a/var/spack/repos/builtin/packages/mfem/package.py +++ b/var/spack/repos/builtin/packages/mfem/package.py @@ -200,7 +200,8 @@ class Mfem(Package, CudaPackage, ROCmPackage): depends_on('mpi', when='+mpi') depends_on('hypre@2.10.0:2.13.99', when='@:3.3.99+mpi') depends_on('hypre@:2.20.0', when='@3.4:4.2.99+mpi') - depends_on('hypre', when='@4.3.0:+mpi') + depends_on('hypre@:2.22.0', when='@4.3.0+mpi') + depends_on('hypre', when='+mpi') depends_on('metis', when='+metis') depends_on('blas', when='+lapack') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index a35dbf3e4f..01bcc57e15 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -251,8 +251,10 @@ class Petsc(Package, CudaPackage, ROCmPackage): depends_on('hypre@:2.13.99+mpi~internal-superlu+int64', when='@:3.8.99+hypre+mpi~complex+int64') depends_on('hypre@2.14:2.18.2+mpi~internal-superlu~int64', when='@3.9:3.13.99+hypre+mpi~complex~int64') depends_on('hypre@2.14:2.18.2+mpi~internal-superlu+int64', when='@3.9:3.13.99+hypre+mpi~complex+int64') - depends_on('hypre@2.14:+mpi~internal-superlu~int64', when='@3.14:+hypre+mpi~complex~int64') - depends_on('hypre@2.14:+mpi~internal-superlu+int64', when='@3.14:+hypre+mpi~complex+int64') + depends_on('hypre@2.14:2.22.0+mpi~internal-superlu~int64', when='@3.14:3.15.99+hypre+mpi~complex~int64') + depends_on('hypre@2.14:2.22.0+mpi~internal-superlu+int64', when='@3.14:3.15.99+hypre+mpi~complex+int64') + depends_on('hypre@2.14:+mpi~internal-superlu~int64', when='@3.16:+hypre+mpi~complex~int64') + depends_on('hypre@2.14:+mpi~internal-superlu+int64', when='@3.16:+hypre+mpi~complex+int64') depends_on('hypre@xsdk-0.2.0+mpi~internal-superlu+int64', when='@xsdk-0.2.0+hypre+mpi~complex+int64') depends_on('hypre@xsdk-0.2.0+mpi~internal-superlu~int64', when='@xsdk-0.2.0+hypre+mpi~complex~int64') depends_on('hypre@develop+mpi~internal-superlu+int64', when='@main+hypre+mpi~complex+int64') -- cgit v1.2.3-70-g09d2