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

intel-mkl: fix usage of openmp_libs and tbb_libs (#9863)

Browse Source 
* intel-mkl: fix usage of openmp_libs and tbb_libs
* intel-mkl: remove trailing whitespace from openmp lib
This commit is contained in:
Denis Davydov 2018-11-16 19:25:15 +01:00 committed by Peter Scheibel
parent 0a57f90d75
commit abd7b185f7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/spack/spack/build_systems/intel.py
View File

@ -674,7 +674,7 @@ def openmp_libs(self):
gcc = Executable(self.compiler.cc) gcc = Executable(self.compiler.cc)
omp_lib_path = gcc( omp_lib_path = gcc(
'--print-file-name', 'libgomp.%s' % dso_suffix, output=str) '--print-file-name', 'libgomp.%s' % dso_suffix, output=str)
omp_libs = LibraryList(omp_lib_path) omp_libs = LibraryList(omp_lib_path.strip())
if len(omp_libs) < 1: if len(omp_libs) < 1:
raise_lib_error('Cannot locate OpenMP libraries:', omp_libnames) raise_lib_error('Cannot locate OpenMP libraries:', omp_libnames)
@ -741,10 +741,10 @@ def blas_libs(self):
mkl_threading = 'libmkl_intel_thread' mkl_threading = 'libmkl_intel_thread'
elif '%gcc' in self.spec: elif '%gcc' in self.spec:
mkl_threading = 'libmkl_gnu_thread' mkl_threading = 'libmkl_gnu_thread'
threading_engine_libs = self.openmp_libs() threading_engine_libs = self.openmp_libs
elif self.spec.satisfies('threads=tbb'): elif self.spec.satisfies('threads=tbb'):
mkl_threading = 'libmkl_tbb_thread' mkl_threading = 'libmkl_tbb_thread'
threading_engine_libs = self.tbb_libs() threading_engine_libs = self.tbb_libs
elif self.spec.satisfies('threads=none'): elif self.spec.satisfies('threads=none'):
mkl_threading = 'libmkl_sequential' mkl_threading = 'libmkl_sequential'
threading_engine_libs = LibraryList([]) threading_engine_libs = LibraryList([])