Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
17580bb2
P
Paddle
项目概览
Crayon鑫
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
17580bb2
编写于
9月 17, 2020
作者:
C
chenzhiyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix the get_ver of musl libc
上级
72be50ca
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
10 deletion
+17
-10
python/paddle/fluid/core.py
python/paddle/fluid/core.py
+17
-10
未找到文件。
python/paddle/fluid/core.py
浏览文件 @
17580bb2
...
@@ -200,10 +200,16 @@ def pre_load(dso_name):
...
@@ -200,10 +200,16 @@ def pre_load(dso_name):
load_dso
(
dso_path
)
load_dso
(
dso_path
)
def
get_glibc_ver
():
def
get_libc_ver
():
return
"musl_"
+
run_shell_command
(
"ldd 2>&1 | awk '/Version/{print $NF}'"
)
ldd_glibc
=
run_shell_command
(
"ldd --version | awk '/ldd/{print $NF}'"
)
#return run_shell_command("ldd --version | awk '/ldd/{print $NF}'")
if
ldd_glibc
is
not
None
:
return
(
"glibc"
,
ldd_glibc
)
ldd_musl
=
run_shell_command
(
"ldd 2>&1 | awk '/Version/{print $NF}'"
)
if
ldd_musl
is
not
None
:
return
(
"musl"
,
ldd_musl
)
return
(
None
,
None
)
def
less_than_ver
(
a
,
b
):
def
less_than_ver
(
a
,
b
):
if
a
is
None
or
b
is
None
:
if
a
is
None
or
b
is
None
:
...
@@ -227,13 +233,14 @@ def less_than_ver(a, b):
...
@@ -227,13 +233,14 @@ def less_than_ver(a, b):
# For paddle, the problem is that 'libgomp' is a DSO with static TLS, and it is loaded after 14 DSOs.
# For paddle, the problem is that 'libgomp' is a DSO with static TLS, and it is loaded after 14 DSOs.
# So, here is a tricky way to solve the problem by pre load 'libgomp' before 'core_avx.so'.
# So, here is a tricky way to solve the problem by pre load 'libgomp' before 'core_avx.so'.
# The final solution is to upgrade glibc to > 2.22 on the target system.
# The final solution is to upgrade glibc to > 2.22 on the target system.
if
platform
.
system
().
lower
()
==
'linux'
and
False
and
less_than_ver
(
get_glibc_ver
(),
if
platform
.
system
().
lower
()
==
'linux'
:
'2.23'
):
libc_type
,
libc_ver
=
get_libc_ver
()
try
:
if
libc_type
==
'glibc'
and
less_than_ver
(
libc_ver
,
'2.23'
):
pre_load
(
'libgomp'
)
try
:
except
Exception
as
e
:
pre_load
(
'libgomp'
)
# NOTE(zhiqiu): do not abort if failed, since it may success when import core_avx.so
except
Exception
as
e
:
sys
.
stderr
.
write
(
'Error: Can not preload libgomp.so'
)
# NOTE(zhiqiu): do not abort if failed, since it may success when import core_avx.so
sys
.
stderr
.
write
(
'Error: Can not preload libgomp.so'
)
load_noavx
=
False
load_noavx
=
False
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录