From 1533c2fade44d1ca37d81539b4b42a647c4aa627 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Mon, 7 Jun 2021 04:16:43 +0200 Subject: [PATCH] dealii: add support for arborx (#24154) --- var/spack/repos/builtin/packages/dealii/package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py index 9793fb24fc..51b6b47ad2 100644 --- a/var/spack/repos/builtin/packages/dealii/package.py +++ b/var/spack/repos/builtin/packages/dealii/package.py @@ -63,6 +63,8 @@ class Dealii(CMakePackage, CudaPackage): # Package variants variant('assimp', default=True, description='Compile with Assimp') + variant('arborx', default=True, + description='Compile with Arborx support') variant('arpack', default=True, description='Compile with Arpack and PArpack (only with MPI)') variant('adol-c', default=True, @@ -160,6 +162,8 @@ class Dealii(CMakePackage, CudaPackage): # Optional dependencies: Packages depends_on('adol-c@2.6.4:', when='@9.0:+adol-c') + depends_on('arborx', when='@9.3:+arborx') + depends_on('arborx+trilinos', when='@9.3:+arborx+trilinos') depends_on('arpack-ng+mpi', when='+arpack+mpi') depends_on('assimp', when='@9.0:+assimp') depends_on('doxygen+graphviz', when='+doc') @@ -266,7 +270,7 @@ class Dealii(CMakePackage, CudaPackage): 'via ~{0}'.format(p)) # interfaces added in 9.3.0: - for p in ['simplex']: # , 'taskflow']: + for p in ['simplex', 'arborx']: # , 'taskflow']: conflicts('+{0}'.format(p), when='@:9.2', msg='The interface to {0} is supported from version 9.3.0 ' 'onwards. Please explicitly disable this variant ' @@ -486,7 +490,7 @@ def cmake_args(self): for library in ( 'gsl', 'hdf5', 'p4est', 'petsc', 'slepc', 'trilinos', 'metis', 'sundials', 'nanoflann', 'assimp', 'gmsh', 'muparser', - 'symengine', 'ginkgo'): # 'taskflow'): + 'symengine', 'ginkgo', 'arborx'): # 'taskflow'): options.append(self.define_from_variant( 'DEAL_II_WITH_{0}'.format(library.upper()), library ))