Updating OpenFAST to use explicit lapack and blas libraries from Spack. (#6824)

* Updating OpenFAST to use explicit lapack and blas libraries from Spack.

* Simplifying openfast blas lib logic and fixes flake8 errors.

* Changing order of blas and lapack libs in openfast package.
This commit is contained in:
Jon Rood 2018-01-06 11:01:06 -07:00 committed by Adam J. Stewart
parent 4cd9bdedd7
commit 8813b3fbd3

View File

@ -56,7 +56,7 @@ class Openfast(CMakePackage):
# Additional dependencies when compiling C++ library # Additional dependencies when compiling C++ library
depends_on('mpi', when='+cxx') depends_on('mpi', when='+cxx')
depends_on('yaml-cpp', when='+cxx') depends_on('yaml-cpp', when='+cxx')
depends_on('hdf5+mpi+cxx', when='+cxx') depends_on('hdf5+mpi+cxx+hl', when='+cxx')
depends_on('zlib', when='+cxx') depends_on('zlib', when='+cxx')
depends_on('libxml2', when='+cxx') depends_on('libxml2', when='+cxx')
@ -79,6 +79,13 @@ def cmake_args(self):
'ON' if '+cxx' in spec else 'OFF'), 'ON' if '+cxx' in spec else 'OFF'),
]) ])
# Make sure we use Spack's blas/lapack:
blas_libs = spec['lapack'].libs + spec['blas'].libs
options.extend([
'-DBLAS_LIBRARIES=%s' % blas_libs.joined(';'),
'-DLAPACK_LIBRARIES=%s' % blas_libs.joined(';')
])
if '+cxx' in spec: if '+cxx' in spec:
options.extend([ options.extend([
'-DMPI_CXX_COMPILER:PATH=%s' % spec['mpi'].mpicxx, '-DMPI_CXX_COMPILER:PATH=%s' % spec['mpi'].mpicxx,