diff options
| author | Asher Mancinelli <ashermancinelli@gmail.com> | 2022-04-20 00:51:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-20 09:51:58 +0200 |
| commit | 5e00dffe7f519d61fa474d183d2623fbce0eae91 (patch) | |
| tree | 38b425392d79cd4020246f91019395c65ee14f69 | |
| parent | 7aa1fef5064aa3882ec1d91ab008201e155b77dd (diff) | |
| download | spack-5e00dffe7f519d61fa474d183d2623fbce0eae91.tar.gz spack-5e00dffe7f519d61fa474d183d2623fbce0eae91.tar.bz2 spack-5e00dffe7f519d61fa474d183d2623fbce0eae91.tar.xz spack-5e00dffe7f519d61fa474d183d2623fbce0eae91.zip | |
Add new hiop version, add ginkgo glu version (#30178)
| -rw-r--r-- | var/spack/repos/builtin/packages/ginkgo/package.py | 1 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hiop/package.py | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/ginkgo/package.py b/var/spack/repos/builtin/packages/ginkgo/package.py index 39fbc0c13d..075ff98956 100644 --- a/var/spack/repos/builtin/packages/ginkgo/package.py +++ b/var/spack/repos/builtin/packages/ginkgo/package.py @@ -22,6 +22,7 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): version('develop', branch='develop') version('master', branch='master') + version('glu', branch='glu') version('1.4.0', commit='f811917c1def4d0fcd8db3fe5c948ce13409e28e') # v1.4.0 version('1.3.0', commit='4678668c66f634169def81620a85c9a20b7cec78') # v1.3.0 version('1.2.0', commit='b4be2be961fd5db45c3d02b5e004d73550722e31') # v1.2.0 diff --git a/var/spack/repos/builtin/packages/hiop/package.py b/var/spack/repos/builtin/packages/hiop/package.py index cbe258aabe..a0c88996f3 100644 --- a/var/spack/repos/builtin/packages/hiop/package.py +++ b/var/spack/repos/builtin/packages/hiop/package.py @@ -18,6 +18,7 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): maintainers = ['ashermancinelli', 'CameronRutherford'] # Most recent tagged snapshot is the preferred version when profiling. + version('0.6.0', commit='21af7eb0d6427be73546cf303abc84e834a5a55d') version('0.5.4', commit='a37a7a677884e95d1c0ad37936aef3778fc91c3e') version('0.5.3', commit='698e8d0fdc0ff9975d8714339ff8c782b70d85f9') version('0.5.2', commit='662ad76dee1f501f648a8bec9a490cb5881789e9') @@ -56,6 +57,7 @@ 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') depends_on('lapack') depends_on('blas') @@ -94,6 +96,8 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): depends_on('coinhsl+blas', when='+sparse') depends_on('metis', when='+sparse') + depends_on('ginkgo@glu+cuda', when='+ginkgo') + conflicts( '+shared', when='+cuda+raja', @@ -130,6 +134,7 @@ class Hiop(CMakePackage, CudaPackage, ROCmPackage): self.define_from_variant('HIOP_SPARSE', 'sparse'), 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'), ]) # NOTE: If building with spack develop on a cluster, you may want to |