提交 ff81bd19 authored 作者: Frederic's avatar Frederic

Test NumPy blas flag before reusing them. Sometimes the dev package

isn't installed, so we can't reuse them.
上级 65b816bc
...@@ -261,7 +261,7 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in ...@@ -261,7 +261,7 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in
#if numpy was linked with library that are not installed, we #if numpy was linked with library that are not installed, we
#can't reuse them. #can't reuse them.
if any(os.path.exists(dir) for dir in blas_info['library_dirs']): if any(os.path.exists(dir) for dir in blas_info['library_dirs']):
return ' '.join( ret = (
#TODO: the Gemm op below should separate the #TODO: the Gemm op below should separate the
# -L and -l arguments into the two callbacks # -L and -l arguments into the two callbacks
# that CLinker uses for that stuff. for now, # that CLinker uses for that stuff. for now,
...@@ -271,6 +271,12 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in ...@@ -271,6 +271,12 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in
['-l%s' % l for l in blas_info['libraries']] + ['-l%s' % l for l in blas_info['libraries']] +
[]) [])
# ['-I%s' % l for l in blas_info['include_dirs']]) # ['-I%s' % l for l in blas_info['include_dirs']])
#if numpy was linked with library that are not installed or
#the dev version of the package is not currently available, we
#can't reuse them.
if GCC_compiler.try_flags(ret):
return ' '.join(ret)
except KeyError: except KeyError:
pass pass
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论