From 4918b7d00756498ffd5ad03646ec4ba76955f14e Mon Sep 17 00:00:00 2001 From: Cameron Rutherford Date: Wed, 19 Jan 2022 05:15:15 -0500 Subject: [PATCH] exago: add v1.3.0 (#28498) --- .../repos/builtin/packages/exago/package.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/exago/package.py b/var/spack/repos/builtin/packages/exago/package.py index 915d9fb547..9046748573 100644 --- a/var/spack/repos/builtin/packages/exago/package.py +++ b/var/spack/repos/builtin/packages/exago/package.py @@ -15,6 +15,7 @@ class Exago(CMakePackage, CudaPackage): git = 'https://gitlab.pnnl.gov/exasgd/frameworks/exago.git' maintainers = ['ashermancinelli', 'CameronRutherford'] + version('1.3.0', commit='58b039d746a6eac8e84b0afc01354cd58caec485', submodules=True, preferred=True) version('1.2.0', commit='255a214e', submodules=True) version('1.1.2', commit='db3bb16e', submodules=True) version('1.1.1', commit='0e0a3f27', submodules=True) @@ -23,25 +24,27 @@ class Exago(CMakePackage, CudaPackage): version('0.99.2', commit='56961641') version('0.99.1', commit='0ae426c7') version('master', branch='master') - version('develop', branch='develop') + version('develop', branch='develop', submodules=True) # Progrmming model options variant('mpi', default=True, description='Enable/Disable MPI') variant('raja', default=False, description='Enable/Disable RAJA') + variant('python', default=True, description='Enable/Disable Python bindings') # Solver options variant('hiop', default=False, description='Enable/Disable HiOp') variant('ipopt', default=False, description='Enable/Disable IPOPT') + conflicts('~hiop~ipopt', msg="ExaGO needs at least one solver enabled") + # Dependencides 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') @@ -59,12 +62,14 @@ class Exago(CMakePackage, CudaPackage): 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@0.5.3:', when='@1.3.0:+hiop') + depends_on('hiop+cuda', when='+hiop+cuda') depends_on('hiop~mpi', when='+hiop~mpi') depends_on('hiop+mpi', when='+hiop+mpi') - # Require PETSc < 3.15 per ExaGO issue #199 - depends_on('petsc@3.13:3.14') + depends_on('petsc@3.13:3.14', when='@:1.2.99') + depends_on('petsc@3.16.0', when='@1.3.0:') depends_on('petsc~mpi', when='~mpi') depends_on('ipopt', when='+ipopt') @@ -83,6 +88,7 @@ def cmake_args(self): args.append(self.define_from_variant('EXAGO_ENABLE_IPOPT', 'ipopt')) args.append(self.define_from_variant('EXAGO_ENABLE_GPU', 'cuda')) args.append(self.define_from_variant('EXAGO_ENABLE_CUDA', 'cuda')) + args.append(self.define_from_variant('EXAGO_ENABLE_PYTHON', 'python')) args.append("-DPETSC_DIR='{0}'".format(spec['petsc'].prefix)) if '+cuda' in spec: