提交 8d680018 authored 作者: Frédéric Bastien's avatar Frédéric Bastien

Merge pull request #4090 from nouiz/blas_rpath

Try blas flags with rpath if they don't work.
...@@ -73,7 +73,7 @@ Environment Variables ...@@ -73,7 +73,7 @@ Environment Variables
device = gpu0 device = gpu0
[lib] [lib]
cnmem = True cnmem = 1
Configuration attributes that are available directly in ``config`` Configuration attributes that are available directly in ``config``
(e.g. ``config.device``, ``config.mode``) should be defined in the (e.g. ``config.device``, ``config.mode``) should be defined in the
......
...@@ -306,6 +306,14 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in ...@@ -306,6 +306,14 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in
if res: if res:
return res return res
# Some environment don't have the lib dir in LD_LIBRARY_PATH.
# So add it.
ret.extend(['-Wl,-rpath,' + l for l in
blas_info.get('library_dirs', [])])
res = try_blas_flag(ret)
if res:
return res
# Try to add the anaconda lib directory to runtime loading of lib. # Try to add the anaconda lib directory to runtime loading of lib.
# This fix some case with Anaconda 2.3 on Linux. # This fix some case with Anaconda 2.3 on Linux.
# Newer Anaconda still have this problem but only have # Newer Anaconda still have this problem but only have
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论