diff options
| author | Cameron Rutherford <cameron.rutherford@me.com> | 2022-12-06 15:57:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-06 21:57:57 +0100 |
| commit | a72021fd63c753a52c1f37ae628e0a0a24214299 (patch) | |
| tree | edeeed03d52cf2676274d224b171ce379b8f6222 /var | |
| parent | d910b3725b6bc6e16e98ffb14ce69047ad9689ef (diff) | |
| download | spack-a72021fd63c753a52c1f37ae628e0a0a24214299.tar.gz spack-a72021fd63c753a52c1f37ae628e0a0a24214299.tar.bz2 spack-a72021fd63c753a52c1f37ae628e0a0a24214299.tar.xz spack-a72021fd63c753a52c1f37ae628e0a0a24214299.zip | |
Fix dependency specification for CuSolver variant in HiOp. (#34138)
Co-authored-by: pelesh <peless@ornl.gov>
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hiop/package.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index 16325dd520..9ae8324ed9 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -63,8 +63,12 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): description="Ultra safety checks - " "used for increased robustness and self-diagnostics", ) variant("ginkgo", default=False, description="Enable/disable ginkgo solver") - variant("cusolver", default=False, description="Enable/disable cuSovler") - + variant( + "cusolver_lu", + default=False, + when="+cuda @0.7.1:", + description="Enable/disable cuSovler LU refactorization", + ) depends_on("lapack") depends_on("blas") depends_on("cmake@3.18:", type="build") @@ -97,7 +101,6 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): depends_on("magma@{0}:".format(magma_v), when="@{0}:+rocm".format(hiop_v)) depends_on("cuda@11:", when="@develop:+cuda") - depends_on("raja", when="+raja") depends_on("umpire", when="+raja") depends_on("raja+openmp", when="+raja~cuda~rocm") @@ -111,6 +114,7 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): depends_on("hipsparse", when="+rocm") depends_on("suite-sparse", when="+kron") + depends_on("suite-sparse", when="+cusolver_lu") depends_on("coinhsl+blas", when="+sparse") depends_on("metis", when="+sparse") @@ -122,8 +126,6 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): when="+cuda+raja", msg="umpire+cuda exports device code and requires static libs", ) - conflicts("+cusolver", when="~cuda", msg="Cusolver requires CUDA") - conflicts("+cusolver", when="@:0.5", msg="Cusolver support was introduced in HiOp 0.6") flag_handler = build_system_flags @@ -159,7 +161,7 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): self.define_from_variant("HIOP_USE_COINHSL", "sparse"), self.define_from_variant("HIOP_TEST_WITH_BSUB", "jsrun"), self.define_from_variant("HIOP_USE_GINKGO", "ginkgo"), - self.define_from_variant("HIOP_USE_CUSOLVER", "cusolver"), + self.define_from_variant("HIOP_USE_CUSOLVER_LU", "cusolver_lu"), ] ) |