diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/alquimia/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/pflotran/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/xsdk/package.py | 21 |
3 files changed, 24 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/alquimia/package.py b/var/spack/repos/builtin/packages/alquimia/package.py index 983bab23f7..55b1a8642a 100644 --- a/var/spack/repos/builtin/packages/alquimia/package.py +++ b/var/spack/repos/builtin/packages/alquimia/package.py @@ -31,6 +31,7 @@ class Alquimia(CMakePackage): homepage = "https://github.com/LBL-EESA/alquimia-dev" + version('xsdk-0.3.0', git='https://github.com/LBL-EESA/alquimia-dev.git', tag='xsdk-0.3.0') version('xsdk-0.2.0', git='https://github.com/LBL-EESA/alquimia-dev.git', tag='xsdk-0.2.0') version('develop', git='https://github.com/LBL-EESA/alquimia-dev.git') @@ -39,8 +40,10 @@ class Alquimia(CMakePackage): depends_on('mpi') depends_on('hdf5') + depends_on('pflotran@xsdk-0.3.0', when='@xsdk-0.3.0') depends_on('pflotran@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('pflotran@develop', when='@develop') + depends_on('petsc@3.8.0:', when='@xsdk-0.3.0') depends_on('petsc@xsdk-0.2.0', when='@xsdk-0.2.0') depends_on('petsc@develop', when='@develop') diff --git a/var/spack/repos/builtin/packages/pflotran/package.py b/var/spack/repos/builtin/packages/pflotran/package.py index e04e33a1db..a57a040107 100644 --- a/var/spack/repos/builtin/packages/pflotran/package.py +++ b/var/spack/repos/builtin/packages/pflotran/package.py @@ -35,10 +35,12 @@ class Pflotran(AutotoolsPackage): version('develop', git='https://bitbucket.org/pflotran/pflotran') version('xsdk-0.2.0', git='https://bitbucket.org/pflotran/pflotran', tag='master') + version('xsdk-0.3.0', git='https://bitbucket.org/pflotran/pflotran', branch='release/xsdk-0.3.0') depends_on('mpi') depends_on('hdf5@1.8.12:+mpi+fortran') depends_on('petsc@develop+hdf5+metis', when='@develop') depends_on('petsc@xsdk-0.2.0+hdf5+metis', when='@xsdk-0.2.0') + depends_on('petsc@3.8.0:+hdf5+metis', when='@xsdk-0.3.0') parallel = False diff --git a/var/spack/repos/builtin/packages/xsdk/package.py b/var/spack/repos/builtin/packages/xsdk/package.py index 901613f77d..e6eaead178 100644 --- a/var/spack/repos/builtin/packages/xsdk/package.py +++ b/var/spack/repos/builtin/packages/xsdk/package.py @@ -40,37 +40,54 @@ class Xsdk(Package): url = 'https://bitbucket.org/saws/saws/get/master.tar.gz' version('develop', 'a52dc710c744afa0b71429b8ec9425bc') + version('0.3.0', 'a52dc710c744afa0b71429b8ec9425bc', preferred=True) version('xsdk-0.2.0', 'a52dc710c744afa0b71429b8ec9425bc') + variant('debug', default=False, description='Compile in debug mode') + variant('cuda', default=False, description='Enable CUDA dependent packages') + + 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@3.3.2+mpi+hypre+superlu-dist+petsc+sundials+examples+miniapps', 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@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+xsdkflags+hypre+superlu-dist+metis+hdf5~mumps+boost~suite-sparse~tpetra~ifpack2~zoltan2~amesos2~exodus', when='@develop') + depends_on('petsc@3.8.2+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', + when='@0.3.0') depends_on('petsc@xsdk-0.2.0+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', when='@xsdk-0.2.0') depends_on('petsc@develop+trilinos+mpi+hypre+superlu-dist+metis+hdf5~mumps~boost+double~int64', 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@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('plasma', when='@0.3.0 %gcc@4.9:') + depends_on('magma', when='@0.3.0 +cuda') + # xSDKTrilinos depends on the version of Trilinos built with # +tpetra which is turned off for faster xSDK # depends_on('xsdktrilinos@xsdk-0.2.0', when='@xsdk-0.2.0') # depends_on('xsdktrilinos@develop', when='@develop') - variant('debug', default=False, description='Compile in debug mode') - # How do we propagate debug flag to all depends on packages ? # If I just do spack install xsdk+debug will that propogate it down? |