From 21d1e03e37f97e4fe11993fca1d9d0d88601d680 Mon Sep 17 00:00:00 2001 From: Asher Mancinelli Date: Fri, 3 Dec 2021 14:59:16 -0700 Subject: ExaGO: add new versions (#27768) --- var/spack/repos/builtin/packages/exago/package.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/exago/package.py b/var/spack/repos/builtin/packages/exago/package.py index 8e0d3f63f0..36ab4ca0e0 100644 --- a/var/spack/repos/builtin/packages/exago/package.py +++ b/var/spack/repos/builtin/packages/exago/package.py @@ -15,9 +15,12 @@ class Exago(CMakePackage, CudaPackage): git = 'https://gitlab.pnnl.gov/exasgd/frameworks/exago.git' maintainers = ['ashermancinelli', 'CameronRutherford'] - version('1.0.0', tag='v1.0.0') - version('0.99.2', tag='v0.99.2') - version('0.99.1', tag='v0.99.1') + version('1.1.2', commit='db3bb16e', submodules=True) + version('1.1.1', commit='0e0a3f27', submodules=True) + version('1.1.0', commit='dc8dd855', submodules=True) + version('1.0.0', commit='230d7df2') + version('0.99.2', commit='56961641') + version('0.99.1', commit='0ae426c7') version('master', branch='master') version('develop', branch='develop') @@ -34,9 +37,13 @@ class Exago(CMakePackage, CudaPackage): depends_on('mpi', when='+mpi') depends_on('blas') depends_on('cuda', when='+cuda') + depends_on('raja', when='+raja') depends_on('raja+cuda', when='+raja+cuda') + depends_on('raja@0.14.0:', when='@1.1.0: +raja') + depends_on('umpire', when='+raja') + depends_on('umpire@6.0.0:', when='@1.1.0: +raja') # Some allocator code in Umpire only works with static libs depends_on('umpire+cuda~shared', when='+raja+cuda') @@ -51,6 +58,7 @@ class Exago(CMakePackage, CudaPackage): # HiOp dependency logic depends_on('hiop+raja', when='+hiop+raja') depends_on('hiop@0.3.99:', when='@0.99:+hiop') + depends_on('hiop@0.5.1:', when='@1.1.0:+hiop') depends_on('hiop+cuda', when='+hiop+cuda') depends_on('hiop~mpi', when='+hiop~mpi') depends_on('hiop+mpi', when='+hiop+mpi') -- cgit v1.2.3-70-g09d2