suite-sparse: fix a bug where interla metis was used; add TBB variant

This commit is contained in:
Denis Davydov 2016-04-02 12:02:29 +02:00
parent 624b576b1e
commit a88c6da9ac

View file

@ -10,10 +10,13 @@ class SuiteSparse(Package):
version('4.5.1', 'f0ea9aad8d2d1ffec66a5b6bfeff5319') version('4.5.1', 'f0ea9aad8d2d1ffec66a5b6bfeff5319')
variant('tbb', default=True, description='Build with Intel TBB')
depends_on('blas') depends_on('blas')
depends_on('lapack') depends_on('lapack')
depends_on('metis@5.1.0', when='@4.5.1') depends_on('metis@5.1.0', when='@4.5.1')
depends_on('tbb', when='+tbb')
def install(self, spec, prefix): def install(self, spec, prefix):
# The build system of SuiteSparse is quite old-fashioned # The build system of SuiteSparse is quite old-fashioned
@ -21,16 +24,35 @@ def install(self, spec, prefix):
# with a lot of convoluted logic in it. # with a lot of convoluted logic in it.
# Any kind of customization will need to go through filtering of that file # Any kind of customization will need to go through filtering of that file
# FIXME : this actually uses the current workaround make_args = ['INSTALL=%s' % prefix]
# FIXME : (blas / lapack always provide libblas and liblapack as aliases)
make('install', 'INSTALL=%s' % prefix,
# inject Spack compiler wrappers # inject Spack compiler wrappers
make_args.extend([
'AUTOCC=no', 'AUTOCC=no',
'CC=cc', 'CC=cc',
'CXX=c++', 'CXX=c++',
'F77=f77', 'F77=f77',
])
# use Spack's metis in CHOLMOD/Partition module,
# otherwise internal Metis will be compiled
make_args.extend([
'MY_METIS_LIB=-L%s -lmetis' % spec['metis'].prefix.lib,
'MY_METIS_INC=%s' % spec['metis'].prefix.include,
])
# Intel TBB in SuiteSparseQR
if '+tbb' in spec:
make_args.extend([
'SPQR_CONFIG=-DHAVE_TBB',
'TBB=-L%s -ltbb' % spec['tbb'].prefix.lib,
])
# BLAS arguments require path to libraries # BLAS arguments require path to libraries
# FIXME : (blas / lapack always provide libblas and liblapack as aliases)
make_args.extend([
'BLAS=-lblas', 'BLAS=-lblas',
'LAPACK=-llapack') 'LAPACK=-llapack'
])
make('install', *make_args)