From d8cb62905ebfb2cba186fd2d736d54a88a49d089 Mon Sep 17 00:00:00 2001 From: Jonas Thies Date: Thu, 8 Mar 2018 05:35:58 -0800 Subject: [PATCH] add headers property to netlib-lapack and intel-mkl --- .../repos/builtin/packages/intel-mkl/package.py | 12 ++++++++++++ .../repos/builtin/packages/netlib-lapack/package.py | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 6cbf355e566..49fe5bf1266 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -182,6 +182,18 @@ def scalapack_libs(self): return libs + @property + def headers(self): + prefix = self.spec.prefix + if sys.platform != 'darwin': + include_dir = prefix.compilers_and_libraries.linux.mkl.include + else: + include_dir = prefix.include + + cblas_h = 'mkl_cblas.h' + lapacke_h = 'mkl_lapacke.h' + return HeaderList([include_dir.cblas_h, include_dir.lapacke_h]) + def setup_dependent_environment(self, spack_env, run_env, dependent_spec): # set up MKLROOT for everyone using MKL package if sys.platform == 'darwin': diff --git a/var/spack/repos/builtin/packages/netlib-lapack/package.py b/var/spack/repos/builtin/packages/netlib-lapack/package.py index 27d70e9c7a7..fd51ab1ee82 100644 --- a/var/spack/repos/builtin/packages/netlib-lapack/package.py +++ b/var/spack/repos/builtin/packages/netlib-lapack/package.py @@ -48,7 +48,8 @@ class NetlibLapack(Package): version('3.4.0', '02d5706ec03ba885fc246e5fa10d8c70') version('3.3.1', 'd0d533ec9a5b74933c2a1e84eedc58b4') - variant('debug', default=False, description='Activates the Debug build type') + variant('debug', default=False, + description='Activates the Debug build type') variant('shared', default=True, description="Build shared library version") variant('external-blas', default=False, description='Build lapack with an external blas') @@ -123,6 +124,13 @@ def lapack_libs(self): libraries, root=self.prefix, shared=shared, recursive=True ) + @property + def headers(self): + include_dir = self.spec.prefix.include + cblas_h = include_dir + 'cblas.h' + lapacke_h = include_dir + 'lapacke.h' + return HeaderList([cblas_h, lapacke_h]) + def install_one(self, spec, prefix, shared): cmake_args = [ '-DBUILD_SHARED_LIBS:BOOL=%s' % ('ON' if shared else 'OFF'),