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

Trilinos: Add STRUMPACK dependency (#19560)

Browse Source 
* Trilinos: Add STRUMPACK dependency

* break long lines, flake8 cleanup

* Use spec['strumpack'].libs.directories[0]
instead of spec['strumpack'].prefix.lib
because libraries may be in lib or lib64.

Likewise use headers.directories[0] iso prefix.include.

Suggested by adamjstewart
This commit is contained in:
Pieter Ghysels 2020-11-03 10:04:12 -08:00 committed by GitHub
parent cd625e5974
commit 8cc08bd88b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
var/spack/repos/builtin/packages/trilinos/package.py
View File

@ -115,6 +115,8 @@ class Trilinos(CMakePackage):
description='Compile with SuperluDist solvers') description='Compile with SuperluDist solvers')
variant('superlu', default=False, variant('superlu', default=False,
description='Compile with SuperLU solvers') description='Compile with SuperLU solvers')
variant('strumpack', default=False,
description='Compile with STRUMPACK solvers')
variant('x11', default=False, variant('x11', default=False,
description='Compile with X11') description='Compile with X11')
variant('zlib', default=False, variant('zlib', default=False,
@ -306,6 +308,8 @@ class Trilinos(CMakePackage):
# and # and
# https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html # https://trilinos.org/pipermail/trilinos-users/2015-March/004802.html
conflicts('+superlu-dist', when='+complex+amesos2') conflicts('+superlu-dist', when='+complex+amesos2')
conflicts('+strumpack', when='@:13.0.99')
conflicts('+strumpack', when='~metis')
# PnetCDF was only added after v12.10.1 # PnetCDF was only added after v12.10.1
conflicts('+pnetcdf', when='@0:12.10.1') conflicts('+pnetcdf', when='@0:12.10.1')
# https://github.com/trilinos/Trilinos/issues/2994 # https://github.com/trilinos/Trilinos/issues/2994
@ -356,6 +360,8 @@ class Trilinos(CMakePackage):
depends_on('superlu-dist@develop', when='@develop+superlu-dist') depends_on('superlu-dist@develop', when='@develop+superlu-dist')
depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0+superlu-dist') depends_on('superlu-dist@xsdk-0.2.0', when='@xsdk-0.2.0+superlu-dist')
depends_on('superlu+pic@4.3', when='+superlu') depends_on('superlu+pic@4.3', when='+superlu')
depends_on('strumpack+shared', when='+strumpack')
depends_on('scalapack', when='+strumpack+mpi')
# Trilinos can not be built against 64bit int hypre # Trilinos can not be built against 64bit int hypre
depends_on('hypre~internal-superlu~int64', when='+hypre') depends_on('hypre~internal-superlu~int64', when='+hypre')
depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre') depends_on('hypre@xsdk-0.2.0~internal-superlu', when='@xsdk-0.2.0+hypre')
@ -650,6 +656,17 @@ def define_tpl_enable(cmake_var, spec_var=None):
define('SuperLU_INCLUDE_DIRS', spec['superlu'].prefix.include), define('SuperLU_INCLUDE_DIRS', spec['superlu'].prefix.include),
]) ])
options.append(define_tpl_enable('STRUMPACK'))
if '+strumpack' in spec:
options.extend([
define('TPL_ENABLE_STRUMPACK', True),
define('Amesos2_ENABLE_STRUMPACK', True),
define('STRUMPACK_LIBRARY_DIRS',
spec['strumpack'].libs.directories[0]),
define('STRUMPACK_INCLUDE_DIRS',
spec['strumpack'].headers.directories[0]),
])
options.append(define_tpl_enable('Pnetcdf')) options.append(define_tpl_enable('Pnetcdf'))
if '+pnetcdf' in spec: if '+pnetcdf' in spec:
options.extend([ options.extend([