diff options
| author | Denis Davydov <davydden@gmail.com> | 2018-04-24 14:10:46 +0200 |
|---|---|---|
| committer | Adam J. Stewart <ajstewart426@gmail.com> | 2018-04-24 07:10:46 -0500 |
| commit | f7da156879328c7b25758db359d2235af9d245e3 (patch) | |
| tree | eb2ba98d9b0abe9949f3c8ac4a978c8cf5201bf7 | |
| parent | 8e1a7eaafa886fe6a416ce26a915724118cf4274 (diff) | |
| download | spack-f7da156879328c7b25758db359d2235af9d245e3.tar.gz spack-f7da156879328c7b25758db359d2235af9d245e3.tar.bz2 spack-f7da156879328c7b25758db359d2235af9d245e3.tar.xz spack-f7da156879328c7b25758db359d2235af9d245e3.zip | |
petsc and slepc: add 3.9.0; hypre: add 2.14 (needed by petsc) (#7877)
| -rw-r--r-- | var/spack/repos/builtin/packages/hypre/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/petsc/package.py | 7 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/slepc/package.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py index d95de54d68..4f60b84427 100644 --- a/var/spack/repos/builtin/packages/hypre/package.py +++ b/var/spack/repos/builtin/packages/hypre/package.py @@ -35,6 +35,7 @@ class Hypre(Package): homepage = "http://computation.llnl.gov/project/linear_solvers/software.php" url = "http://computation.llnl.gov/project/linear_solvers/download/hypre-2.10.0b.tar.gz" + version('2.14.0', 'ecde5cc807ec45bfb647e9f28d2eaea1', url='https://github.com/LLNL/hypre/archive/v2.14.0.tar.gz') version('2.13.0', '4b688a5c15b6b5e3de5e045ae081b89b', url='https://github.com/LLNL/hypre/archive/v2.13.0.tar.gz') version('2.12.1', 'c6fcb6d7e57cec1c7ce4a44da885068c', url='https://github.com/LLNL/hypre/archive/v2.12.1.tar.gz') version('2.11.2', 'd507943a1a3ce5681c3308e2f3a6dd34') diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index 54b0c59b83..13fb5ca018 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -42,6 +42,7 @@ class Petsc(Package): version('develop', git='https://bitbucket.org/petsc/petsc.git', tag='master') version('xsdk-0.2.0', git='https://bitbucket.org/petsc/petsc.git', tag='xsdk-0.2.0') + version('3.9.0', '34b8a81814ca050a96d58e53a2f0ac7a') version('3.8.4', 'd7767fe2919536aa393eb22841899306') version('3.8.3', '322cbcf2a0f7b7bad562643b05d66f11') version('3.8.2', '00666e1c4cbfa8dd6eebf91ff8180f79') @@ -132,12 +133,14 @@ class Petsc(Package): # Also PETSc prefer to build it without internal superlu, likely due to # conflict in headers see # https://bitbucket.org/petsc/petsc/src/90564b43f6b05485163c147b464b5d6d28cde3ef/config/BuildSystem/config/packages/hypre.py - depends_on('hypre~internal-superlu~int64', when='+hypre+mpi~complex~int64') + depends_on('hypre@:2.13.99~internal-superlu~int64', when='@:3.8.99+hypre+mpi~complex~int64') + depends_on('hypre@:2.13.99~internal-superlu+int64', when='@:3.8.99+hypre+mpi~complex+int64') + depends_on('hypre@2.14:~internal-superlu~int64', when='@3.9:+hypre+mpi~complex~int64') + depends_on('hypre@2.14:~internal-superlu+int64', when='@3.9+hypre+mpi~complex+int64') depends_on('hypre@xsdk-0.2.0~internal-superlu+int64', when='@xsdk-0.2.0+hypre+mpi~complex+int64') depends_on('hypre@xsdk-0.2.0~internal-superlu~int64', when='@xsdk-0.2.0+hypre+mpi~complex~int64') depends_on('hypre@develop~internal-superlu+int64', when='@develop+hypre+mpi~complex+int64') depends_on('hypre@develop~internal-superlu~int64', when='@develop+hypre+mpi~complex~int64') - depends_on('hypre~internal-superlu+int64', when='+hypre+mpi~complex+int64') depends_on('superlu-dist@:4.3~int64', when='@3.4.4:3.6.4+superlu-dist+mpi~int64') depends_on('superlu-dist@:4.3+int64', when='@3.4.4:3.6.4+superlu-dist+mpi+int64') depends_on('superlu-dist@5.0.0:~int64', when='@3.7:3.7.99+superlu-dist+mpi~int64') diff --git a/var/spack/repos/builtin/packages/slepc/package.py b/var/spack/repos/builtin/packages/slepc/package.py index 07b60849a1..0fb73ddca6 100644 --- a/var/spack/repos/builtin/packages/slepc/package.py +++ b/var/spack/repos/builtin/packages/slepc/package.py @@ -34,6 +34,7 @@ class Slepc(Package): homepage = "http://www.grycap.upv.es/slepc" url = "http://slepc.upv.es/download/distrib/slepc-3.6.2.tar.gz" + version('3.9.0', '1f3930db56b4065aaf214ea758ddff1a70bf19d45544cbdfd19d2787db4bfe0b') version('3.8.2', '1e7d20d20eb26da307d36017461fe4a55f40e947e232739179dbe6412e22ed13') version('3.8.0', 'c58ccc4e852d1da01112466c48efa41f0839649f3a265925788237d76cd3d963') version('3.7.4', '2fb782844e3bc265a8d181c3c3e2632a4ca073111c874c654f1365d33ca2eb8a') @@ -49,6 +50,7 @@ class Slepc(Package): depends_on('python@2.6:2.8', type='build') # Cannot mix release and development versions of SLEPc and PETSc: depends_on('petsc@develop', when='@develop') + depends_on('petsc@3.9:3.9.99', when='@3.9:3.9.99') depends_on('petsc@3.8:3.8.99', when='@3.8:3.8.99') depends_on('petsc@3.7:3.7.7', when='@3.7.1:3.7.4') depends_on('petsc@3.6.3:3.6.4', when='@3.6.2:3.6.3') |