diff --git a/packages/dune/package.py b/packages/dune/package.py index 88b913d..f7ba28d 100644 --- a/packages/dune/package.py +++ b/packages/dune/package.py @@ -100,25 +100,14 @@ class Dune(CMakePackage): variant('doc', default=False, description='Build and install documentation') variant('python', default=False, description='Build with Python bindings') - # Variants for upstream dependencies - variant('arpack', default=True, description='Build ARnoldi PACKage library support') - variant('blas', default=True, description='Build with BLAS support') - variant('gmp', default=True, description='Build with GNU multi-precision library support') - variant('lapack', default=True, description='Build with LAPACK support') - variant('metis', default=True, description='Build with METIS library support') + # Variants for upstream dependencies. Note that we are exposing only very + # costly upstream dependencies as variants. All other upstream dependencies + # are installed unconditionally. This happens in an attempt to limit the total + # number of variants of the dune package to a readable amount. An exception + # to this rule is ParMETIS, which has a variant because of it's semi-free license. variant('parmetis', default=False, description='Build with ParMETIS support') variant('petsc', default=False, description='Build with PetSc support') - variant('ptscotch', default=True, description='Build with PT-Scotch support') - variant('sionlib', default=False, description='Build with SIONlib support') - variant('suitesparse', default=True, description='Build SuiteSparse library support') - variant('superlu', default=False, description='Build Supernodal LU library support') variant('tbb', default=False, description='Build with Intel TBB support') - variant('vc', default=False, description='Build C++ Vectorization library support') - variant('zlib', default=False, description='Build zlib library support') - variant('zoltan', default=False, description='Build with Zoltan support') - - # Some variants that were here that are on my todo list - # variant('jupyter', default=False, description='Build with Jupyter support') # Define one variant for each non-core Dune module that we have. for var, res in dune_variants_to_resources.items(): @@ -280,20 +269,20 @@ class Dune(CMakePackage): python_components = [ 'dune' ] # Specify upstream dependencies (often depending on variants) - depends_on('arpack-ng', when='+arpack') + depends_on('amgx', when='+fem+petsc') + depends_on('arpack-ng') depends_on('benchmark', when='+codegen') - depends_on('blas', when='+blas') + depends_on('blas') depends_on('cmake@3.1:', type='build') depends_on('eigen', when='+fem') depends_on('eigen', when='+pdelab') depends_on('papi', when='+fem') depends_on('doxygen', type='build', when='+doc') depends_on('gawk') - depends_on('gmp', when='+gmp') + depends_on('gmp') depends_on('intel-tbb', when='+tbb') - depends_on('lapack', when='+lapack') + depends_on('lapack') # depends_on('likwid', when='+codegen') likwid cannot be built in spack v0.14.2 due to the lua dependency being broken - depends_on('metis', when='+metis') depends_on('mpi') depends_on('parmetis', when='+parmetis') depends_on('petsc', when='+petsc') @@ -304,13 +293,13 @@ class Dune(CMakePackage): depends_on('py-pip', type=('build', 'run')) depends_on('py-sphinx', type=('build', 'run'), when='+doc') depends_on('py-wheel', type='build') - depends_on('scotch+mpi', when='+ptscotch') + depends_on('scotch+mpi') depends_on('sionlib', when='+sionlib') - depends_on('suite-sparse', when='+suitesparse') - depends_on('superlu', when='+superlu') - depends_on('vc', when='+vc') - depends_on('zlib', when='+zlib') - depends_on('zoltan', when='+zoltan') + depends_on('suite-sparse') + depends_on('superlu') + depends_on('vc') + depends_on('zlib', when='+alugrid') + depends_on('zoltan', when='+alugrid') # Apply patches patch('virtualenv_from_envvariable.patch', when='+testtools')