From 5e4264ed890e292f103d40f30d29d85338315fb6 Mon Sep 17 00:00:00 2001 From: Satish Balay Date: Tue, 9 Oct 2018 14:19:29 -0500 Subject: xsdk: reorder develop version statements (#9469) --- var/spack/repos/builtin/packages/xsdk/package.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 97dd075bf5..41a2c8bcd5 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -46,51 +46,51 @@ class Xsdk(Package): variant('debug', default=False, description='Compile in debug mode') variant('cuda', default=False, description='Enable CUDA dependent packages') + depends_on('hypre@develop~internal-superlu', when='@develop') 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('hypre@develop~internal-superlu', when='@develop') - depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.3.0') depends_on('mfem@develop+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@develop') + depends_on('mfem@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', when='@0.3.0') + depends_on('superlu-dist@develop', when='@develop') depends_on('superlu-dist@5.2.2', when='@0.3.0') depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0') - depends_on('superlu-dist@develop', when='@develop') + depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus', + when='@develop') depends_on('trilinos@12.12.1+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@0.3.0') depends_on('trilinos@xsdk-0.2.0+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@xsdk-0.2.0') - depends_on('trilinos@develop+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse+tpetra+nox+ifpack2+zoltan2+amesos2~exodus', - when='@develop') + depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', + when='@develop') depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@0.3.0') depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', when='@xsdk-0.2.0') - depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps+double~int64', - when='@develop') depends_on('dealii@develop~assimp~python~doc~slepc~gmsh+petsc+mpi+trilinos~int64+hdf5~netcdf+metis', when='@develop') + depends_on('pflotran@develop', when='@develop') depends_on('pflotran@xsdk-0.3.0', when='@0.3.0') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0') - depends_on('pflotran@develop', when='@develop') + depends_on('alquimia@develop', when='@develop') depends_on('alquimia@xsdk-0.3.0', when='@0.3.0') depends_on('alquimia@xsdk-0.2.0', when='@xsdk-0.2.0') - depends_on('alquimia@develop', when='@develop') - depends_on('sundials@3.1.0~int64+hypre', when='@0.3.0') depends_on('sundials@3.1.0~int64+hypre', when='@develop') + depends_on('sundials@3.1.0~int64+hypre', when='@0.3.0') depends_on('plasma@17.2:', when='@develop %gcc@6.0:') - depends_on('magma@2.2.0', when='@0.3.0 +cuda') depends_on('magma@2.2.0', when='@develop +cuda') + depends_on('magma@2.2.0', when='@0.3.0 +cuda') - depends_on('amrex@develop', when='@develop %gcc') depends_on('amrex@develop', when='@develop %intel') + depends_on('amrex@develop', when='@develop %gcc') depends_on('slepc@develop', when='@develop') -- cgit v1.2.3-70-g09d2