summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorRob Falgout <rfalgout@llnl.gov>2023-07-26 09:57:30 -0700
committerGitHub <noreply@github.com>2023-07-26 11:57:30 -0500
commit8c417b3ccc5801cafd3b72b8546f11c69d117bf0 (patch)
tree8263ee83e8b961214055ad5a72e523507f6fe332 /var
parent52c0127fc7d744a94ad4f869603558412900d6b0 (diff)
downloadspack-8c417b3ccc5801cafd3b72b8546f11c69d117bf0.tar.gz
spack-8c417b3ccc5801cafd3b72b8546f11c69d117bf0.tar.bz2
spack-8c417b3ccc5801cafd3b72b8546f11c69d117bf0.tar.xz
spack-8c417b3ccc5801cafd3b72b8546f11c69d117bf0.zip
Update package.py for new hypre release 2.29.0 (#38537)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/hypre/package.py1
-rw-r--r--var/spack/repos/builtin/packages/petsc/package.py17
2 files changed, 8 insertions, 10 deletions
diff --git a/var/spack/repos/builtin/packages/hypre/package.py b/var/spack/repos/builtin/packages/hypre/package.py
index d7fc90fdaf..5285057cc7 100644
--- a/var/spack/repos/builtin/packages/hypre/package.py
+++ b/var/spack/repos/builtin/packages/hypre/package.py
@@ -24,6 +24,7 @@ class Hypre(AutotoolsPackage, CudaPackage, ROCmPackage):
test_requires_compiler = True
version("develop", branch="master")
+ version("2.29.0", sha256="98b72115407a0e24dbaac70eccae0da3465f8f999318b2c9241631133f42d511")
version("2.28.0", sha256="2eea68740cdbc0b49a5e428f06ad7af861d1e169ce6a12d2cf0aa2fc28c4a2ae")
version("2.27.0", sha256="507a3d036bb1ac21a55685ae417d769dd02009bde7e09785d0ae7446b4ae1f98")
version("2.26.0", sha256="c214084bddc61a06f3758d82947f7f831e76d7e3edeac2c78bb82d597686e05d")
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py
index 0470b533ab..2677731a82 100644
--- a/var/spack/repos/builtin/packages/petsc/package.py
+++ b/var/spack/repos/builtin/packages/petsc/package.py
@@ -247,22 +247,19 @@ class Petsc(Package, CudaPackage, ROCmPackage):
depends_on("mmg", when="+parmmg")
depends_on("parmmg", when="+parmmg")
depends_on("tetgen+pic", when="+tetgen")
- # hypre+/~fortran based on wheter fortran is enabled/disabled
+
depends_on("hypre+fortran", when="+hypre+fortran")
depends_on("hypre~fortran", when="+hypre~fortran")
- # Hypre does not support complex numbers.
- # 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@2.14:2.18.2~internal-superlu", when="@3.11:3.13+hypre")
- depends_on("hypre@2.14:2.22.0~internal-superlu", when="@3.14:3.15+hypre")
- depends_on("hypre@2.14:~internal-superlu", when="@3.16:+hypre")
- depends_on("hypre@develop~internal-superlu", when="@main+hypre")
depends_on("hypre+complex", when="+hypre+complex")
depends_on("hypre~complex", when="+hypre~complex")
depends_on("hypre+int64", when="+hypre+int64")
depends_on("hypre~int64", when="+hypre~int64")
- depends_on("hypre+mpi", when="+hypre+mpi")
+ depends_on("hypre+mpi~internal-superlu", when="+hypre")
+ depends_on("hypre@2.14:2.18.2", when="@3.11:3.13+hypre")
+ depends_on("hypre@2.14:2.22.0", when="@3.14:3.15+hypre")
+ depends_on("hypre@2.14:2.28.0", when="@3.16:3.19+hypre")
+ depends_on("hypre@2.14:", when="@3.20+hypre")
+ depends_on("hypre@develop", when="@main+hypre")
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")