提交 9c3d3f45 authored 作者: Arnaud Bergeron's avatar Arnaud Bergeron

Use lib64 on linux.

上级 76e434ad
...@@ -362,7 +362,7 @@ AddConfigVar('dnn.conv.precision', ...@@ -362,7 +362,7 @@ AddConfigVar('dnn.conv.precision',
# We want to default to the cuda root if cudnn is installed there # We want to default to the cuda root if cudnn is installed there
def default_dnn_base_path(): def default_dnn_base_path():
root = get_cuda_root() root = theano.config.cuda.root
# The include doesn't change location between OS. # The include doesn't change location between OS.
if root and os.path.exists(os.path.join(root, 'include', 'cudnn.h')): if root and os.path.exists(os.path.join(root, 'include', 'cudnn.h')):
return root return root
...@@ -389,9 +389,13 @@ AddConfigVar('dnn.include_path', ...@@ -389,9 +389,13 @@ AddConfigVar('dnn.include_path',
def default_dnn_lib_path(): def default_dnn_lib_path():
if theano.config.dnn.base_path != '': if theano.config.dnn.base_path != '':
path = os.path.join(theano.config.dnn.base_path, 'lib')
if sys.platform == 'win32': if sys.platform == 'win32':
path = os.path.join(path, 'x64') path = os.path.join(theano.config.dnn.base_path, 'lib', 'x64')
elif sys.platform == 'darwin':
path = os.path.join(theano.config.dnn.base_path, 'lib')
else:
# This is linux
path = os.path.join(theano.config.dnn.base_path, 'lib64')
return path return path
return '' return ''
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论