zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ROCm constraints for ginkgo@glu_experimental in HiOp (#32499)

Browse Source 
* 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
This commit is contained in:
Cameron Rutherford
2022-10-13 12:41:18 -04:00
committed by GitHub
parent 0c4ad440c6
commit e20d45f3bc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
var/spack/repos/builtin/packages/ginkgo/package.py
View File

@@ -22,9 +22,9 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage):
version("develop", branch="develop") version("develop", branch="develop")
version("master", branch="master") version("master", branch="master")
version("glu", branch="glu") version("1.5.0.glu", branch="glu")
version("glu_experimental", branch="glu_experimental") version("1.5.0.glu_experimental", branch="glu_experimental")
version("1.4.0", commit="f811917c1def4d0fcd8db3fe5c948ce13409e28e") # v1.4.0 version("1.4.0", commit="f811917c1def4d0fcd8db3fe5c948ce13409e28e", preferred=True) # v1.4.0
version("1.3.0", commit="4678668c66f634169def81620a85c9a20b7cec78") # v1.3.0 version("1.3.0", commit="4678668c66f634169def81620a85c9a20b7cec78") # v1.3.0
version("1.2.0", commit="b4be2be961fd5db45c3d02b5e004d73550722e31") # v1.2.0 version("1.2.0", commit="b4be2be961fd5db45c3d02b5e004d73550722e31") # v1.2.0
version("1.1.1", commit="08d2c5200d3c78015ac8a4fd488bafe1e4240cf5") # v1.1.1 version("1.1.1", commit="08d2c5200d3c78015ac8a4fd488bafe1e4240cf5") # v1.1.1

2
var/spack/repos/builtin/packages/hiop/package.py
View File

@@ -113,7 +113,7 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage):
depends_on("coinhsl+blas", when="+sparse") depends_on("coinhsl+blas", when="+sparse")
depends_on("metis", 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( conflicts(
"+shared", "+shared",