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

dealii: don't hardcode blas and mpi; minor fixes to dependencies

Browse Source
This commit is contained in:
Denis Davydov 2016-05-26 10:25:16 +02:00
parent 76d42b5200
commit 0036483ded
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
var/spack/repos/builtin/packages/dealii/package.py
View File

@ -50,8 +50,8 @@ class Dealii(Package):
depends_on ("blas") depends_on ("blas")
# Boost 1.58 is blacklisted, see https://github.com/dealii/dealii/issues/1591 # Boost 1.58 is blacklisted, see https://github.com/dealii/dealii/issues/1591
# require at least 1.59 # require at least 1.59
depends_on ("boost@1.59.0:", when='~mpi') depends_on ("boost@1.59.0:+thread+system+serialization+iostreams", when='~mpi')
depends_on ("boost@1.59.0:+mpi", when='+mpi') depends_on ("boost@1.59.0:+mpi+thread+system+serialization+iostreams", when='+mpi')
depends_on ("bzip2") depends_on ("bzip2")
depends_on ("cmake") depends_on ("cmake")
depends_on ("lapack") depends_on ("lapack")
@ -63,10 +63,11 @@ class Dealii(Package):
# optional dependencies # optional dependencies
depends_on ("mpi", when="+mpi") depends_on ("mpi", when="+mpi")
depends_on ("arpack-ng+mpi", when='+arpack+mpi') depends_on ("arpack-ng+mpi", when='+arpack+mpi')
depends_on ("doxygen", when='+doc') depends_on ("doxygen+graphviz", when='+doc')
depends_on ("graphviz", when='+doc')
depends_on ("gsl", when='@8.5.0:+gsl') depends_on ("gsl", when='@8.5.0:+gsl')
depends_on ("gsl", when='@dev+gsl') depends_on ("gsl", when='@dev+gsl')
depends_on ("hdf5+mpi~cxx", when='+hdf5+mpi') #FIXME NetCDF declares dependency with ~cxx, why? depends_on ("hdf5+mpi", when='+hdf5+mpi')
depends_on ("metis@5:", when='+metis') depends_on ("metis@5:", when='+metis')
depends_on ("netcdf+mpi", when="+netcdf+mpi") depends_on ("netcdf+mpi", when="+netcdf+mpi")
depends_on ("netcdf-cxx", when='+netcdf+mpi') depends_on ("netcdf-cxx", when='+netcdf+mpi')
@ -104,8 +105,8 @@ def install(self, spec, prefix):
(spec['lapack'].prefix.include, (spec['lapack'].prefix.include,
spec['blas'].prefix.include), spec['blas'].prefix.include),
'-DLAPACK_LIBRARIES=%s;%s' % '-DLAPACK_LIBRARIES=%s;%s' %
(join_path(spec['lapack'].prefix.lib,'liblapack.%s' % dsuf), # FIXME don't hardcode names (spec['lapack'].lapack_shared_lib,
join_path(spec['blas'].prefix.lib,'libblas.%s' % dsuf)), # FIXME don't hardcode names spec['blas'].blas_shared_lib),
'-DMUPARSER_DIR=%s ' % spec['muparser'].prefix, '-DMUPARSER_DIR=%s ' % spec['muparser'].prefix,
'-DUMFPACK_DIR=%s' % spec['suite-sparse'].prefix, '-DUMFPACK_DIR=%s' % spec['suite-sparse'].prefix,
'-DTBB_DIR=%s' % spec['tbb'].prefix, '-DTBB_DIR=%s' % spec['tbb'].prefix,
@ -116,9 +117,9 @@ def install(self, spec, prefix):
if '+mpi' in spec: if '+mpi' in spec:
options.extend([ options.extend([
'-DDEAL_II_WITH_MPI:BOOL=ON', '-DDEAL_II_WITH_MPI:BOOL=ON',
'-DCMAKE_C_COMPILER=%s' % join_path(self.spec['mpi'].prefix.bin, 'mpicc'), # FIXME: avoid hardcoding mpi wrappers names '-DCMAKE_C_COMPILER=%s' % spec['mpi'].mpicc,
'-DCMAKE_CXX_COMPILER=%s' % join_path(self.spec['mpi'].prefix.bin, 'mpic++'), '-DCMAKE_CXX_COMPILER=%s' % spec['mpi'].mpicxx,
'-DCMAKE_Fortran_COMPILER=%s' % join_path(self.spec['mpi'].prefix.bin, 'mpif90'), '-DCMAKE_Fortran_COMPILER=%s' % spec['mpi'].mpifc,
]) ])
else: else:
options.extend([ options.extend([