From def5b237633f6cfa51d5619d34880a993c5d3a32 Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Fri, 29 Mar 2019 21:01:43 +0100 Subject: add libs property to IntelMkl and IntelParallelStudio (#10993) * add libs property to IntelMkl and IntelParallelStudio * fix scalapack_libs when MPI is provided by intel-parallel-studio --- var/spack/repos/builtin/packages/intel-mkl/package.py | 14 ++++++++++++++ .../builtin/packages/intel-parallel-studio/package.py | 14 ++++++++++++++ 2 files changed, 28 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/intel-mkl/package.py b/var/spack/repos/builtin/packages/intel-mkl/package.py index 2ed678df1f..e447d88894 100644 --- a/var/spack/repos/builtin/packages/intel-mkl/package.py +++ b/var/spack/repos/builtin/packages/intel-mkl/package.py @@ -6,6 +6,7 @@ import sys from spack import * +from spack.build_systems.intel import debug_print class IntelMkl(IntelPackage): @@ -64,3 +65,16 @@ class IntelMkl(IntelPackage): if sys.platform == 'darwin': # there is no libmkl_gnu_thread on macOS conflicts('threads=openmp', when='%gcc') + + @property + def libs(self): + libs = LibraryList([]) + if self.provides('blas'): + libs = self.blas_libs + if self.provides('lapack'): + libs = self.lapack_libs + libs + if self.provides('scalapack'): + libs = self.scalapack_libs + libs + + debug_print(libs) + return libs diff --git a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py index 8eaef6bf9a..b0793adf5f 100644 --- a/var/spack/repos/builtin/packages/intel-parallel-studio/package.py +++ b/var/spack/repos/builtin/packages/intel-parallel-studio/package.py @@ -4,6 +4,7 @@ # SPDX-License-Identifier: (Apache-2.0 OR MIT) from spack import * +from spack.build_systems.intel import debug_print class IntelParallelStudio(IntelPackage): @@ -195,3 +196,16 @@ class IntelParallelStudio(IntelPackage): 'F90': spack_fc, 'FC': spack_fc, }) + + @property + def libs(self): + libs = LibraryList([]) + if self.provides('blas'): + libs = self.blas_libs + if self.provides('lapack'): + libs = self.lapack_libs + libs + if self.provides('scalapack'): + libs = self.scalapack_libs + libs + + debug_print(libs) + return libs -- cgit v1.2.3-70-g09d2