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

Merge pull request #1174 from LLNL/bugfix/github-1172-suite-sparse

Browse Source 
Bugfix/GitHub 1172 suite sparse
This commit is contained in:
Todd Gamblin 2016-07-06 14:35:59 -07:00 committed by GitHub
commit 91da3d8e64
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
var/spack/repos/builtin/packages/suite-sparse/package.py
View File

@ -33,6 +33,7 @@ class SuiteSparse(Package):
url = 'http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.5.1.tar.gz' url = 'http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.5.1.tar.gz'
version('4.5.1', 'f0ea9aad8d2d1ffec66a5b6bfeff5319') version('4.5.1', 'f0ea9aad8d2d1ffec66a5b6bfeff5319')
version('4.5.3', '8ec57324585df3c6483ad7f556afccbd')
# FIXME: (see below) # FIXME: (see below)
# variant('tbb', default=True, description='Build with Intel TBB') # variant('tbb', default=True, description='Build with Intel TBB')
@ -40,34 +41,35 @@ class SuiteSparse(Package):
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:')
# FIXME: # FIXME:
# in @4.5.1. TBB support in SPQR seems to be broken as TBB-related linkng flags # in @4.5.1. TBB support in SPQR seems to be broken as TBB-related linkng
# does not seem to be used, which leads to linking errors on Linux. # flags does not seem to be used, which leads to linking errors on Linux.
# Try re-enabling in future versions. # Try re-enabling in future versions.
# depends_on('tbb', when='+tbb') # 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.
# It's basically a plain Makefile which include an header (SuiteSparse_config/SuiteSparse_config.mk) # It's basically a plain Makefile which include an header
# with a lot of convoluted logic in it. # (SuiteSparse_config/SuiteSparse_config.mk)with a lot of convoluted
# Any kind of customization will need to go through filtering of that file # logic in it. Any kind of customization will need to go through
# filtering of that file
make_args = ['INSTALL=%s' % prefix] make_args = ['INSTALL=%s' % prefix]
# inject Spack compiler wrappers # inject Spack compiler wrappers
make_args.extend([ 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, # use Spack's metis in CHOLMOD/Partition module,
# otherwise internal Metis will be compiled # otherwise internal Metis will be compiled
make_args.extend([ make_args.extend([
'MY_METIS_LIB=-L%s -lmetis' % spec['metis'].prefix.lib, 'MY_METIS_LIB=-L%s -lmetis' % spec['metis'].prefix.lib,
'MY_METIS_INC=%s' % spec['metis'].prefix.include, 'MY_METIS_INC=%s' % spec['metis'].prefix.include,
]) ])
# Intel TBB in SuiteSparseQR # Intel TBB in SuiteSparseQR
@ -78,10 +80,13 @@ def install(self, spec, prefix):
]) ])
# BLAS arguments require path to libraries # BLAS arguments require path to libraries
# FIXME : (blas / lapack always provide libblas and liblapack as aliases) # FIXME: (blas/lapack always provide libblas and liblapack as aliases)
make_args.extend([ if '@4.5.1' in spec:
'BLAS=-lblas', # adding -lstdc++ is clearly an ugly way to do this, but it follows
'LAPACK=-llapack' # with the TCOV path of SparseSuite 4.5.1's Suitesparse_config.mk
]) make_args.extend([
'BLAS=-lblas -lstdc++',
'LAPACK=-llapack'
])
make('install', *make_args) make('install', *make_args)