diff options
| author | Tristan Carel <tristan.carel@epfl.ch> | 2023-04-02 17:00:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-02 10:00:10 -0500 |
| commit | ac62817ba0c9b7fb64a63d3cfc135081a1575546 (patch) | |
| tree | e620c721e039bde630054ec37a526cfa60713f5f | |
| parent | 08cf82b977bf0708c277e9e874f87c839f411be0 (diff) | |
| download | spack-ac62817ba0c9b7fb64a63d3cfc135081a1575546.tar.gz spack-ac62817ba0c9b7fb64a63d3cfc135081a1575546.tar.bz2 spack-ac62817ba0c9b7fb64a63d3cfc135081a1575546.tar.xz spack-ac62817ba0c9b7fb64a63d3cfc135081a1575546.zip | |
petsc: simplify dependencies with hypre (#36573)
* petsc: simplify dependencies with hypre
* add propagation of `complex` variant to hypre
| -rw-r--r-- | var/spack/repos/builtin/packages/petsc/package.py | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/var/spack/repos/builtin/packages/petsc/package.py b/var/spack/repos/builtin/packages/petsc/package.py index d0bf68bf87..8708f12b26 100644 --- a/var/spack/repos/builtin/packages/petsc/package.py +++ b/var/spack/repos/builtin/packages/petsc/package.py @@ -248,24 +248,16 @@ class Petsc(Package, CudaPackage, ROCmPackage): # 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.13+mpi~internal-superlu~int64", when="@:3.8+hypre+mpi~complex~int64") - depends_on("hypre@:2.13+mpi~internal-superlu+int64", when="@:3.8+hypre+mpi~complex+int64") - depends_on( - "hypre@2.14:2.18.2+mpi~internal-superlu~int64", when="@3.9:3.13+hypre+mpi~complex~int64" - ) - depends_on( - "hypre@2.14:2.18.2+mpi~internal-superlu+int64", when="@3.9:3.13+hypre+mpi~complex+int64" - ) - depends_on( - "hypre@2.14:2.22.0+mpi~internal-superlu~int64", when="@3.14:3.15+hypre+mpi~complex~int64" - ) - depends_on( - "hypre@2.14:2.22.0+mpi~internal-superlu+int64", when="@3.14:3.15+hypre+mpi~complex+int64" - ) - depends_on("hypre@2.14:+mpi~internal-superlu~int64", when="@3.16:+hypre+mpi~complex~int64") - depends_on("hypre@2.14:+mpi~internal-superlu+int64", when="@3.16:+hypre+mpi~complex+int64") - depends_on("hypre@develop+mpi~internal-superlu+int64", when="@main+hypre+mpi~complex+int64") - depends_on("hypre@develop+mpi~internal-superlu~int64", when="@main+hypre+mpi~complex~int64") + 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("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:5.1.3~int64", when="@3.7.0:3.7+superlu-dist+mpi~int64") |