提交 fcc9944e authored 作者: Mohammad Pezeshki's avatar Mohammad Pezeshki

try_flags is replaced by try_blas_flag

上级 6b4055de
......@@ -288,8 +288,7 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in
flags += ['-l%s' % l for l in ["mkl_core",
"mkl_intel_thread",
"mkl_rt"]]
if GCC_compiler.try_flags(flags) and try_blas_flag():
flags += ['-lblas']
if try_blas_flag(flags):
return ' '.join(flags)
# If numpy was linked with library that are not installed or
......@@ -305,16 +304,14 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in
['-L%s' % l for l in blas_info['library_dirs']] +
['-l%s' % l for l in blas_info['libraries']] +
[])
if GCC_compiler.try_flags(ret) and try_blas_flag():
ret += ['-lblas']
if try_blas_flag(ret):
return ' '.join(ret)
# Try to add the anaconda lib directory to runtime loading of lib.
# This fix some case with Anaconda 2.3 on Linux.
if "Anaconda" in sys.version and "linux" in sys.platform:
lib_path = os.path.join(sys.prefix, 'lib')
ret.append('-Wl,-rpath,' + lib_path)
if GCC_compiler.try_flags(ret) and try_blas_flag():
ret += ['-lblas']
if try_blas_flag(ret):
return ' '.join(ret)
except KeyError:
......@@ -328,7 +325,7 @@ SOMEPATH/Canopy_64bit/User/lib/python2.7/site-packages/numpy/distutils/system_in
return try_blas_flag()
def try_blas_flag():
def try_blas_flag(flags):
test_code = textwrap.dedent("""\
extern "C" float sdot_(int*, float*, int*, float*, int*);
int main(int argc, char** argv)
......@@ -345,14 +342,12 @@ def try_blas_flag():
return 0;
}
""")
flags = ['-lblas']
flags.extend('-L' + d for d in theano.gof.cmodule.std_lib_dirs())
res = GCC_compiler.try_compile_tmp(
test_code, tmp_prefix='try_blas_',
flags=flags, try_run=True)
# res[0]: shows successful compilation
# res[1]: shows successful execution
print(res)
if res and res[0] and res[1]:
return "-lblas"
else:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论