diff options
| author | Cameron Rutherford <cameron.rutherford@me.com> | 2022-10-13 12:41:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-13 09:41:18 -0700 |
| commit | e20d45f3bc0c83d4731fc5b507fcf2110be37b33 (patch) | |
| tree | a1cdb31788569b47f2cd589cb258807a1186e7e2 /var | |
| parent | 0c4ad440c63812a83226e5176dbc8326a09b03df (diff) | |
| download | spack-e20d45f3bc0c83d4731fc5b507fcf2110be37b33.tar.gz spack-e20d45f3bc0c83d4731fc5b507fcf2110be37b33.tar.bz2 spack-e20d45f3bc0c83d4731fc5b507fcf2110be37b33.tar.xz spack-e20d45f3bc0c83d4731fc5b507fcf2110be37b33.zip | |
Fix ROCm constraints for ginkgo@glu_experimental in HiOp (#32499)
* Remove ROCm constraints for ginkgo@glu_experimental.
* Fix style.
* Apply @tcojean suggestion.
* Fix hip_repair_options in camp package.
* Remvoe old ROCm logic.
* Remove added whitespace.
* Fix style issue.
* Revert camp changes.
* Revert camp whitespace change.
* Set Ginkgo preferred version to 1.4.0
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/ginkgo/package.py | 6 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hiop/package.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/var/spack/repos/builtin/packages/ginkgo/package.py b/var/spack/repos/builtin/packages/ginkgo/package.py index 8899964a54..e2ebbe1377 100644 --- a/var/spack/repos/builtin/packages/ginkgo/package.py +++ b/var/spack/repos/builtin/packages/ginkgo/package.py @@ -22,9 +22,9 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): version("develop", branch="develop") version("master", branch="master") - version("glu", branch="glu") - version("glu_experimental", branch="glu_experimental") - version("1.4.0", commit="f811917c1def4d0fcd8db3fe5c948ce13409e28e") # v1.4.0 + version("1.5.0.glu", branch="glu") + version("1.5.0.glu_experimental", branch="glu_experimental") + version("1.4.0", commit="f811917c1def4d0fcd8db3fe5c948ce13409e28e", preferred=True) # v1.4.0 version("1.3.0", commit="4678668c66f634169def81620a85c9a20b7cec78") # v1.3.0 version("1.2.0", commit="b4be2be961fd5db45c3d02b5e004d73550722e31") # v1.2.0 version("1.1.1", commit="08d2c5200d3c78015ac8a4fd488bafe1e4240cf5") # v1.1.1 diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index b770a78618..7b7e08c41b 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -113,7 +113,7 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): depends_on("coinhsl+blas", when="+sparse") depends_on("metis", when="+sparse") - depends_on("ginkgo@glu_experimental", when="+ginkgo") + depends_on("ginkgo@1.5.0.glu_experimental", when="+ginkgo") conflicts( "+shared", |