summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSatish Balay <balay@mcs.anl.gov>2020-04-30 10:33:02 -0500
committerGitHub <noreply@github.com>2020-04-30 10:33:02 -0500
commit3a3f8717185868285ebc1e0226b0d7a320ef404c (patch)
tree584b9fc18eb8c074cd48a5595e652198834f0df3
parentd5d4e16f3d21060a14ba6c4a21577fdbe02a1b6b (diff)
downloadspack-3a3f8717185868285ebc1e0226b0d7a320ef404c.tar.gz
spack-3a3f8717185868285ebc1e0226b0d7a320ef404c.tar.bz2
spack-3a3f8717185868285ebc1e0226b0d7a320ef404c.tar.xz
spack-3a3f8717185868285ebc1e0226b0d7a320ef404c.zip
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
-rw-r--r--var/spack/repos/builtin/packages/xsdk/package.py9
1 files changed, 5 insertions, 4 deletions
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')