From 3a3f8717185868285ebc1e0226b0d7a320ef404c Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Thu, 30 Apr 2020 10:33:02 -0500 Subject: xsdk: update to mfem and py-petsc4py changes (#16378) mfem variant hypre is now rolled into variant mpi - so update spec accordingly mfem@4.0.1-xsdk+superlu-dist is broken and unsupported - so disable it with the addition of py-petsc4py@3.13.0 - conretizer gets confused and is not picking py-petsc4py@3.12.0 as a compatible dependency with petsc@3.12. So manually specify it. Also depends_on('py-libensemble@0.5.2+petsc4py ^py-petsc4py@3.12.0' causes concretizer to hang forever --- var/spack/repos/builtin/packages/xsdk/package.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index b2f036a416..352521181a 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -43,10 +43,10 @@ class Xsdk(BundlePackage): depends_on('hypre@2.12.1~internal-superlu', when='@0.3.0') depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0') - depends_on('mfem@develop+mpi+hypre+superlu-dist+petsc~sundials+examples+miniapps', when='@develop') - depends_on('mfem@4.0.1-xsdk+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.5.0') - depends_on('mfem@3.4.0+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.4.0') - depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.3.0') + depends_on('mfem@develop+mpi+superlu-dist+petsc~sundials+examples+miniapps', when='@develop') + depends_on('mfem@4.0.1-xsdk+mpi~superlu-dist+petsc+sundials+examples+miniapps', when='@0.5.0') + depends_on('mfem@3.4.0+mpi+superlu-dist+petsc+sundials+examples+miniapps', when='@0.4.0') + depends_on('mfem@3.3.2+mpi+superlu-dist+petsc+sundials+examples+miniapps', when='@0.3.0') depends_on('superlu-dist@develop', when='@develop') depends_on('superlu-dist@6.1.1', when='@0.5.0') @@ -164,6 +164,7 @@ class Xsdk(BundlePackage): depends_on('py-libensemble@develop+petsc4py', type='run', when='@develop +libensemble') depends_on('py-libensemble@0.5.2+petsc4py', type='run', when='@0.5.0 +libensemble') + depends_on('py-petsc4py@3.12.0', type='run', when='@0.5.0 +libensemble') depends_on('precice ~petsc', when='platform=cray +precice') depends_on('precice@develop', when='@develop +precice') -- cgit v1.2.3-70-g09d2