提交 51dc3c85 authored 作者: Frédéric Bastien's avatar Frédéric Bastien 提交者: GitHub

Merge pull request #6361 from notoraptor/fix-cudnn-rpath-linux

Fix rpath for cuDNN module.
...@@ -231,11 +231,8 @@ dnn_available.msg = None ...@@ -231,11 +231,8 @@ dnn_available.msg = None
def CUDNNDataType(name, freefunc=None): def CUDNNDataType(name, freefunc=None):
cargs = [] cargs = []
if config.dnn.bin_path: if config.dnn.bin_path and sys.platform != 'win32':
if sys.platform == 'darwin': cargs.append('-Wl,-rpath,' + config.dnn.bin_path)
cargs.append('-Wl,-rpath,' + config.dnn.bin_path)
else:
cargs.append('-Wl,-rpath,"' + config.dnn.bin_path + '"')
return CDataType(name, freefunc, return CDataType(name, freefunc,
headers=['cudnn.h'], headers=['cudnn.h'],
...@@ -263,11 +260,8 @@ class DnnVersion(Op): ...@@ -263,11 +260,8 @@ class DnnVersion(Op):
return [config.dnn.library_path] return [config.dnn.library_path]
def c_compile_args(self): def c_compile_args(self):
if config.dnn.bin_path: if config.dnn.bin_path and sys.platform != 'win32':
if sys.platform == 'darwin': return ['-Wl,-rpath,' + config.dnn.bin_path]
return ['-Wl,-rpath,' + config.dnn.bin_path]
else:
return ['-Wl,-rpath,"' + config.dnn.bin_path + '"']
return [] return []
def c_support_code(self): def c_support_code(self):
...@@ -395,11 +389,8 @@ class DnnBase(COp): ...@@ -395,11 +389,8 @@ class DnnBase(COp):
return [config.dnn.library_path] return [config.dnn.library_path]
def c_compile_args(self): def c_compile_args(self):
if config.dnn.bin_path: if config.dnn.bin_path and sys.platform != 'win32':
if sys.platform == 'darwin': return ['-Wl,-rpath,' + config.dnn.bin_path]
return ['-Wl,-rpath,' + config.dnn.bin_path]
else:
return ['-Wl,-rpath,"' + config.dnn.bin_path + '"']
return [] return []
def c_code_cache_version(self): def c_code_cache_version(self):
...@@ -443,11 +434,8 @@ class GpuDnnConvDesc(COp): ...@@ -443,11 +434,8 @@ class GpuDnnConvDesc(COp):
return [config.dnn.library_path] return [config.dnn.library_path]
def c_compile_args(self): def c_compile_args(self):
if config.dnn.bin_path: if config.dnn.bin_path and sys.platform != 'win32':
if sys.platform == 'darwin': return ['-Wl,-rpath,' + config.dnn.bin_path]
return ['-Wl,-rpath,' + config.dnn.bin_path]
else:
return ['-Wl,-rpath,"' + config.dnn.bin_path + '"']
return [] return []
def do_constant_folding(self, node): def do_constant_folding(self, node):
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论