hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

flake 8 fixes

Browse source
This commit is contained in:
Greg Lee 2016-07-05 14:28:24 -07:00
parent 4c063c6055
commit 4e27d91351
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
var/spack/repos/builtin/packages/suite-sparse/package.py
View file

@ -44,32 +44,33 @@ class SuiteSparse(Package):
depends_on('metis@5.1.0', when='@4.5.1') depends_on('metis@5.1.0', when='@4.5.1')
depends_on('metis@5.1.0', when='@4.5.3') depends_on('metis@5.1.0', when='@4.5.3')
# 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
@ -80,10 +81,10 @@ 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)
if '@4.5.1' in spec: if '@4.5.1' in spec:
# adding -lstdc++ is clearly an ugly way to do this, but it follows suit # adding -lstdc++ is clearly an ugly way to do this, but it follows
# with the TCOV path of SparseSuite 4.5.1's Suitesparse_config.mk # with the TCOV path of SparseSuite 4.5.1's Suitesparse_config.mk
make_args.extend([ make_args.extend([
'BLAS=-lblas -lstdc++', 'BLAS=-lblas -lstdc++',
'LAPACK=-llapack' 'LAPACK=-llapack'