minor cleanup

This commit is contained in:
Denis Davydov 2016-03-25 16:58:14 +01:00
parent 5172f09b9f
commit eec50b524b

View file

@ -28,6 +28,7 @@ class Trilinos(Package):
variant('superlu-dist', default=True, description='Compile with SuperluDist solvers') variant('superlu-dist', default=True, description='Compile with SuperluDist solvers')
variant('hypre', default=True, description='Compile with Hypre preconditioner') variant('hypre', default=True, description='Compile with Hypre preconditioner')
variant('hdf5', default=True, description='Compile with HDF5') variant('hdf5', default=True, description='Compile with HDF5')
variant('scalapack', default=True, description='Compile with Scalapack')
variant('suite-sparse', default=True, description='Compile with SuiteSparse solvers') variant('suite-sparse', default=True, description='Compile with SuiteSparse solvers')
variant('python', default=True, description='Build python wrappers') variant('python', default=True, description='Build python wrappers')
variant('shared', default=True, description='Enables the build of shared libraries') variant('shared', default=True, description='Enables the build of shared libraries')
@ -110,13 +111,6 @@ def install(self, spec, prefix):
'-DTrilinos_EXTRA_LINK_FLAGS:STRING=-L%s/ -lgfortran' % libgfortran, '-DTrilinos_EXTRA_LINK_FLAGS:STRING=-L%s/ -lgfortran' % libgfortran,
'-DTrilinos_ENABLE_Fortran=ON' '-DTrilinos_ENABLE_Fortran=ON'
]) ])
# FIXME:
# VerifyFortranC test of CMake does not contain -lgfortran and thus fails.
# This could be GCC/CMake related, but appears at least on OSX with Clang@7.0.2 and GNU Fortran@5.3.0
#if sys.platform == 'darwin':
# options.extend([
# '-DTrilinos_SKIP_FORTRANCINTERFACE_VERIFY_TEST:BOOL=TRUE'
# ])
# for build-debug only: # for build-debug only:
#options.extend([ #options.extend([
@ -135,6 +129,11 @@ def install(self, spec, prefix):
'-DUMFPACK_INCLUDE_DIRS:PATH=%s' % spec['suite-sparse'].prefix.include, '-DUMFPACK_INCLUDE_DIRS:PATH=%s' % spec['suite-sparse'].prefix.include,
'-DUMFPACK_LIBRARY_NAMES=umfpack;amd;colamd;cholmod;suitesparseconfig' '-DUMFPACK_LIBRARY_NAMES=umfpack;amd;colamd;cholmod;suitesparseconfig'
]) ])
else:
options.extend([
'-DTPL_ENABLE_Cholmod:BOOL=OFF',
'-DTPL_ENABLE_UMFPACK:BOOL=OFF',
])
# metis / parmetis # metis / parmetis
if '+parmetis' in spec: # metis is required, see variants_check() if '+parmetis' in spec: # metis is required, see variants_check()
@ -148,6 +147,11 @@ def install(self, spec, prefix):
'-DParMETIS_LIBRARY_NAMES=parmetis;metis', '-DParMETIS_LIBRARY_NAMES=parmetis;metis',
'-DTPL_ParMETIS_INCLUDE_DIRS=%s' % spec['parmetis'].prefix.include '-DTPL_ParMETIS_INCLUDE_DIRS=%s' % spec['parmetis'].prefix.include
]) ])
else:
options.extend([
'-DTPL_ENABLE_METIS:BOOL=OFF',
'-DTPL_ENABLE_ParMETIS:BOOL=OFF',
])
# mumps # mumps
if '+mumps' in spec: if '+mumps' in spec:
@ -156,12 +160,22 @@ def install(self, spec, prefix):
'-DMUMPS_LIBRARY_DIRS=%s' % spec['mumps'].prefix.lib, '-DMUMPS_LIBRARY_DIRS=%s' % spec['mumps'].prefix.lib,
'-DMUMPS_LIBRARY_NAMES=dmumps;mumps_common;pord' # order is important! '-DMUMPS_LIBRARY_NAMES=dmumps;mumps_common;pord' # order is important!
]) ])
else:
options.extend([
'-DTPL_ENABLE_MUMPS:BOOL=OFF',
])
# scalapack # scalapack
options.extend([ if '+scalapack' in spec:
'-DTPL_ENABLE_SCALAPACK:BOOL=ON', options.extend([
'-DSCALAPACK_LIBRARY_NAMES=scalapack' # FIXME: for MKL it's mkl_scalapack_lp64;mkl_blacs_mpich_lp64 '-DTPL_ENABLE_SCALAPACK:BOOL=ON',
]) '-DSCALAPACK_LIBRARY_NAMES=scalapack' # FIXME: for MKL it's mkl_scalapack_lp64;mkl_blacs_mpich_lp64
])
else:
options.extend([
'-DTPL_ENABLE_SCALAPACK:BOOL=OFF',
])
# superlu-dist: # superlu-dist:
if '+superlu-dist' in spec: if '+superlu-dist' in spec:
@ -181,12 +195,22 @@ def install(self, spec, prefix):
options.extend([ options.extend([
'-DHAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG:BOOL=ON' '-DHAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG:BOOL=ON'
]) ])
else:
options.extend([
'-DTPL_ENABLE_SuperLUDist:BOOL=OFF',
])
# python # python
if '~python' in spec: if '~python' in spec:
options.extend([ options.extend([
'-DTrilinos_ENABLE_PyTrilinos:BOOL=OFF' '-DTrilinos_ENABLE_PyTrilinos:BOOL=OFF'
]) ])
else:
options.extend([
'-DTrilinos_ENABLE_PyTrilinos:BOOL=ON'
])
# disable due to compiler / config errors: # disable due to compiler / config errors:
options.extend([ options.extend([