zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dealii: Added 'threads' variant that controls the TBB dependency (#13931)

Browse Source 
* dealii: Added 'threads' variant that controls the DEAL_II_WITH_THREADS cmake option and the dependency on Intel TBB

* Update var/spack/repos/builtin/packages/dealii/package.py

Co-Authored-By: Adam J. Stewart <ajstewart426@gmail.com>
This commit is contained in:
Alexander Knieps 2019-12-01 20:34:26 +01:00 committed by Adam J. Stewart
parent c7568c9146
commit 8e3ff9b39c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -66,6 +66,8 @@ class Dealii(CMakePackage, CudaPackage):
description='Compile with Slepc (only with Petsc and MPI)') description='Compile with Slepc (only with Petsc and MPI)')
variant('symengine', default=True, variant('symengine', default=True,
description='Compile with SymEngine') description='Compile with SymEngine')
variant('threads', default=True,
description='Compile with multi-threading via TBB')
variant('trilinos', default=True, variant('trilinos', default=True,
description='Compile with Trilinos (only with MPI)') description='Compile with Trilinos (only with MPI)')
variant('python', default=False, variant('python', default=False,
@ -110,7 +112,6 @@ class Dealii(CMakePackage, CudaPackage):
depends_on('bzip2', when='@:8.99') depends_on('bzip2', when='@:8.99')
depends_on('lapack') depends_on('lapack')
depends_on('suite-sparse') depends_on('suite-sparse')
depends_on('tbb')
depends_on('zlib') depends_on('zlib')
# optional dependencies # optional dependencies
@ -159,6 +160,7 @@ class Dealii(CMakePackage, CudaPackage):
# depends_on("symengine@0.4: build_type=Release", when="@9.1:+symengine+trilinos^trilinos~debug") # NOQA: ignore=E501 # depends_on("symengine@0.4: build_type=Release", when="@9.1:+symengine+trilinos^trilinos~debug") # NOQA: ignore=E501
# depends_on("symengine@0.4: build_type=Debug", when="@9.1:+symengine+trilinos^trilinos+debug") # NOQA: ignore=E501 # depends_on("symengine@0.4: build_type=Debug", when="@9.1:+symengine+trilinos^trilinos+debug") # NOQA: ignore=E501
depends_on('symengine@0.4:', when='@9.1:+symengine') depends_on('symengine@0.4:', when='@9.1:+symengine')
depends_on('tbb', when='+threads')
# do not require +rol to make concretization of xsdk possible # do not require +rol to make concretization of xsdk possible
depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos', when='+trilinos+mpi~int64~cuda') depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos', when='+trilinos+mpi~int64~cuda')
depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos~hypre', when='+trilinos+mpi+int64~cuda') depends_on('trilinos+amesos+aztec+epetra+ifpack+ml+muelu+sacado+teuchos~hypre', when='+trilinos+mpi+int64~cuda')
@ -233,7 +235,6 @@ def cmake_args(self):
lapack_blas_headers = spec['lapack'].headers + spec['blas'].headers lapack_blas_headers = spec['lapack'].headers + spec['blas'].headers
options.extend([ options.extend([
'-DDEAL_II_COMPONENT_EXAMPLES=ON', '-DDEAL_II_COMPONENT_EXAMPLES=ON',
'-DDEAL_II_WITH_THREADS:BOOL=ON',
'-DBOOST_DIR=%s' % spec['boost'].prefix, '-DBOOST_DIR=%s' % spec['boost'].prefix,
# CMake's FindBlas/Lapack may pickup system's blas/lapack instead # CMake's FindBlas/Lapack may pickup system's blas/lapack instead
# of Spack's. Be more specific to avoid this. # of Spack's. Be more specific to avoid this.
@ -247,7 +248,13 @@ def cmake_args(self):
'-DDEAL_II_ALLOW_BUNDLED=OFF' '-DDEAL_II_ALLOW_BUNDLED=OFF'
]) ])
if (spec.satisfies('^intel-parallel-studio+tbb')): if '+threads' in spec:
options.append('-DDEAL_II_WITH_THREADS:BOOL=ON')
else:
options.extend(['-DDEAL_II_WITH_THREADS:BOOL=OFF'])
if (spec.satisfies('^intel-parallel-studio+tbb')
and '+threads' in spec):
# deal.II/cmake will have hard time picking up TBB from Intel. # deal.II/cmake will have hard time picking up TBB from Intel.
tbb_ver = '.'.join(('%s' % spec['tbb'].version).split('.')[1:]) tbb_ver = '.'.join(('%s' % spec['tbb'].version).split('.')[1:])
options.extend([ options.extend([