提交 2fe88f36 authored 作者: abergeron's avatar abergeron

Merge pull request #4231 from abergeron/release_fix

Fix the last problems identified for the release.
...@@ -362,6 +362,9 @@ class DnnVersion(GpuOp): ...@@ -362,6 +362,9 @@ class DnnVersion(GpuOp):
def c_lib_dirs(self): def c_lib_dirs(self):
return [config.dnn.library_path] return [config.dnn.library_path]
def c_compile_args(self):
return ['-Wl,-rpath,' + config.dnn.library_path]
def c_support_code(self): def c_support_code(self):
return """ return """
#if PY_MAJOR_VERSION >= 3 #if PY_MAJOR_VERSION >= 3
......
...@@ -97,6 +97,9 @@ class DnnBase(GpuOp, COp): ...@@ -97,6 +97,9 @@ class DnnBase(GpuOp, COp):
def c_lib_dirs(self): def c_lib_dirs(self):
return [config.dnn.library_path] return [config.dnn.library_path]
def c_compile_args(self):
return ['-Wl,-rpath,' + config.dnn.library_path]
class GpuDnnConvDesc(GpuOp): class GpuDnnConvDesc(GpuOp):
""" """
......
...@@ -55,7 +55,7 @@ def is_nvcc_available(): ...@@ -55,7 +55,7 @@ def is_nvcc_available():
return False return False
rpath_defaults = [config.dnn.library_path] rpath_defaults = []
def add_standard_rpath(rpath): def add_standard_rpath(rpath):
......
...@@ -174,7 +174,7 @@ class DnnBase(COp): ...@@ -174,7 +174,7 @@ class DnnBase(COp):
return [config.dnn.library_path] return [config.dnn.library_path]
def c_compile_args(self): def c_compile_args(self):
return ['-rpath', config.dnn.library_path] return ['-Wl,-rpath,' + config.dnn.library_path]
def c_code_cache_version(self): def c_code_cache_version(self):
return (super(DnnBase, self).c_code_cache_version(), version()) return (super(DnnBase, self).c_code_cache_version(), version())
...@@ -196,7 +196,7 @@ class DnnVersion(Op): ...@@ -196,7 +196,7 @@ class DnnVersion(Op):
return [config.dnn.library_path] return [config.dnn.library_path]
def c_compile_args(self): def c_compile_args(self):
return ['-rpath', config.dnn.library_path] return ['-Wl,-rpath,' + config.dnn.library_path]
def c_support_code(self): def c_support_code(self):
return """ return """
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论