diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/superlu/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/trilinos/package.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/superlu/package.py b/var/spack/repos/builtin/packages/superlu/package.py index df5c7bcaaf..b9ec27fee0 100644 --- a/var/spack/repos/builtin/packages/superlu/package.py +++ b/var/spack/repos/builtin/packages/superlu/package.py @@ -34,13 +34,11 @@ class Superlu(CMakePackage, Package): version( "4.3", sha256="169920322eb9b9c6a334674231479d04df72440257c17870aaa0139d74416781", - deprecated=True, url="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_4.3.tar.gz", ) version( "4.2", sha256="5a06e19bf5a597405dfeea39fe92aa8c5dd41da73c72c7187755a75f581efb28", - deprecated=True, url="https://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_4.2.tar.gz", ) diff --git a/var/spack/repos/builtin/packages/trilinos/package.py b/var/spack/repos/builtin/packages/trilinos/package.py index 91f4656778..faaee0970e 100644 --- a/var/spack/repos/builtin/packages/trilinos/package.py +++ b/var/spack/repos/builtin/packages/trilinos/package.py @@ -325,6 +325,9 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): conflicts("+strumpack", when="@:13.0") # Can only use one type of SuperLU conflicts("+superlu-dist", when="+superlu") + # Amesos and Ifpack only support up to SuperLU 4.x.y interfaces + conflicts("+amesos", when="+superlu@5:") + conflicts("+ifpack", when="+superlu@5:") # For Trilinos v11 we need to force SuperLUDist=OFF, since only the # deprecated SuperLUDist v3.3 together with an Amesos patch is working. conflicts("+superlu-dist", when="@11.4.1:11.14.3") @@ -440,7 +443,9 @@ class Trilinos(CMakePackage, CudaPackage, ROCmPackage): depends_on("strumpack+shared", when="+strumpack") depends_on("suite-sparse", when="+suite-sparse") depends_on("superlu-dist", when="+superlu-dist") - depends_on("superlu@4.3 +pic", when="+superlu") + depends_on("superlu@3:5.2", when="@12.18.1: +superlu") + depends_on("superlu@3:5.1.1", when="@12.14.1 +superlu") + depends_on("superlu@3:4", when="@:12.12.1 +superlu") depends_on("swig", when="@:14 +python") depends_on("zlib-api", when="+zoltan") |