Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
d3011c75
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 2 年 前同步成功
通知
2325
Star
20933
Fork
5424
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
d3011c75
编写于
1月 17, 2022
作者:
F
Fan Zhang
提交者:
GitHub
1月 17, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add retry in pull dense (#38927)
Co-authored-by:
N
yaoxuefeng
<
yaoxuefeng@baidu.com
>
上级
56943dd4
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
52 addition
and
3 deletion
+52
-3
paddle/fluid/framework/fleet/fleet_wrapper.cc
paddle/fluid/framework/fleet/fleet_wrapper.cc
+52
-3
未找到文件。
paddle/fluid/framework/fleet/fleet_wrapper.cc
浏览文件 @
d3011c75
...
@@ -424,6 +424,7 @@ void FleetWrapper::PullSparseToTensorSync(const uint64_t table_id, int fea_dim,
...
@@ -424,6 +424,7 @@ void FleetWrapper::PullSparseToTensorSync(const uint64_t table_id, int fea_dim,
if
(
ret
!=
0
)
{
if
(
ret
!=
0
)
{
LOG
(
ERROR
)
<<
"fleet pull sparse failed, status["
<<
ret
<<
"]"
;
LOG
(
ERROR
)
<<
"fleet pull sparse failed, status["
<<
ret
<<
"]"
;
sleep
(
sleep_seconds_before_fail_exit_
);
sleep
(
sleep_seconds_before_fail_exit_
);
exit
(
-
1
);
}
}
#else
#else
for
(
size_t
index
=
0
;
index
<
inputs
->
size
();
++
index
)
{
for
(
size_t
index
=
0
;
index
<
inputs
->
size
();
++
index
)
{
...
@@ -473,9 +474,36 @@ void FleetWrapper::PullDenseVarsSync(
...
@@ -473,9 +474,36 @@ void FleetWrapper::PullDenseVarsSync(
paddle
::
ps
::
Region
reg
(
w
,
tensor
->
numel
());
paddle
::
ps
::
Region
reg
(
w
,
tensor
->
numel
());
regions
.
emplace_back
(
std
::
move
(
reg
));
regions
.
emplace_back
(
std
::
move
(
reg
));
}
}
auto
status
=
int32_t
status
=
-
1
;
pslib_ptr_
->
_worker_ptr
->
pull_dense
(
regions
.
data
(),
regions
.
size
(),
tid
);
int32_t
cnt
=
0
;
status
.
wait
();
while
(
true
)
{
auto
tt
=
pslib_ptr_
->
_worker_ptr
->
pull_dense
(
regions
.
data
(),
regions
.
size
(),
tid
);
bool
flag
=
true
;
tt
.
wait
();
try
{
status
=
tt
.
get
();
}
catch
(
const
std
::
future_error
&
e
)
{
VLOG
(
0
)
<<
"Caught a future_error with code"
<<
e
.
code
()
<<
", Message:"
<<
e
.
what
();
}
if
(
status
!=
0
)
{
VLOG
(
0
)
<<
"fleet pull dense sync failed, status["
<<
status
<<
"]"
;
sleep
(
sleep_seconds_before_fail_exit_
);
flag
=
false
;
cnt
++
;
}
if
(
cnt
>
3
)
{
VLOG
(
0
)
<<
"fleet pull dense sync failed, retry 3 times"
;
exit
(
-
1
);
}
if
(
flag
)
{
break
;
}
}
#endif
#endif
}
}
...
@@ -924,6 +952,7 @@ void FleetWrapper::LoadModelOneTable(const uint64_t table_id,
...
@@ -924,6 +952,7 @@ void FleetWrapper::LoadModelOneTable(const uint64_t table_id,
if
(
ret
.
get
()
!=
0
)
{
if
(
ret
.
get
()
!=
0
)
{
LOG
(
ERROR
)
<<
"load model of table id: "
<<
table_id
LOG
(
ERROR
)
<<
"load model of table id: "
<<
table_id
<<
", from path: "
<<
path
<<
" failed"
;
<<
", from path: "
<<
path
<<
" failed"
;
exit
(
-
1
);
}
}
#else
#else
VLOG
(
0
)
<<
"FleetWrapper::LoadModel does nothing when no pslib"
;
VLOG
(
0
)
<<
"FleetWrapper::LoadModel does nothing when no pslib"
;
...
@@ -939,6 +968,7 @@ void FleetWrapper::LoadWithWhitelist(const uint64_t table_id,
...
@@ -939,6 +968,7 @@ void FleetWrapper::LoadWithWhitelist(const uint64_t table_id,
if
(
ret
.
get
()
!=
0
)
{
if
(
ret
.
get
()
!=
0
)
{
LOG
(
ERROR
)
<<
"load model of table id: "
<<
table_id
LOG
(
ERROR
)
<<
"load model of table id: "
<<
table_id
<<
", from path: "
<<
path
<<
" failed"
;
<<
", from path: "
<<
path
<<
" failed"
;
exit
(
-
1
);
}
}
#else
#else
VLOG
(
0
)
<<
"FleetWrapper::LoadWhitelist does nothing when no pslib"
;
VLOG
(
0
)
<<
"FleetWrapper::LoadWhitelist does nothing when no pslib"
;
...
@@ -987,6 +1017,7 @@ void FleetWrapper::SaveModelOneTable(const uint64_t table_id,
...
@@ -987,6 +1017,7 @@ void FleetWrapper::SaveModelOneTable(const uint64_t table_id,
if
(
ret
.
get
()
!=
0
)
{
if
(
ret
.
get
()
!=
0
)
{
LOG
(
ERROR
)
<<
"save model of table id: "
<<
table_id
LOG
(
ERROR
)
<<
"save model of table id: "
<<
table_id
<<
", to path: "
<<
path
<<
" failed"
;
<<
", to path: "
<<
path
<<
" failed"
;
exit
(
-
1
);
}
}
#else
#else
VLOG
(
0
)
<<
"FleetWrapper::SaveModelOneTable does nothing when no pslib"
;
VLOG
(
0
)
<<
"FleetWrapper::SaveModelOneTable does nothing when no pslib"
;
...
@@ -1004,6 +1035,7 @@ void FleetWrapper::SaveModelOneTablePrefix(const uint64_t table_id,
...
@@ -1004,6 +1035,7 @@ void FleetWrapper::SaveModelOneTablePrefix(const uint64_t table_id,
if
(
ret
.
get
()
!=
0
)
{
if
(
ret
.
get
()
!=
0
)
{
LOG
(
ERROR
)
<<
"save model (with prefix) of table id: "
<<
table_id
LOG
(
ERROR
)
<<
"save model (with prefix) of table id: "
<<
table_id
<<
", to path: "
<<
path
<<
" failed"
;
<<
", to path: "
<<
path
<<
" failed"
;
exit
(
-
1
);
}
}
#else
#else
VLOG
(
0
)
<<
"FleetWrapper::SaveModelOneTablePrefix does nothing when no pslib"
;
VLOG
(
0
)
<<
"FleetWrapper::SaveModelOneTablePrefix does nothing when no pslib"
;
...
@@ -1102,6 +1134,11 @@ void FleetWrapper::ShrinkSparseTable(int table_id) {
...
@@ -1102,6 +1134,11 @@ void FleetWrapper::ShrinkSparseTable(int table_id) {
#ifdef PADDLE_WITH_PSLIB
#ifdef PADDLE_WITH_PSLIB
auto
ret
=
pslib_ptr_
->
_worker_ptr
->
shrink
(
table_id
);
auto
ret
=
pslib_ptr_
->
_worker_ptr
->
shrink
(
table_id
);
ret
.
wait
();
ret
.
wait
();
int32_t
err_code
=
ret
.
get
();
if
(
err_code
==
-
1
)
{
LOG
(
ERROR
)
<<
"Shrink Sparse Table failed"
;
exit
(
-
1
);
}
#else
#else
VLOG
(
0
)
<<
"FleetWrapper::ShrinkSparseTable does nothing when no pslib"
;
VLOG
(
0
)
<<
"FleetWrapper::ShrinkSparseTable does nothing when no pslib"
;
#endif
#endif
...
@@ -1111,6 +1148,10 @@ void FleetWrapper::ClearModel() {
...
@@ -1111,6 +1148,10 @@ void FleetWrapper::ClearModel() {
#ifdef PADDLE_WITH_PSLIB
#ifdef PADDLE_WITH_PSLIB
auto
ret
=
pslib_ptr_
->
_worker_ptr
->
clear
();
auto
ret
=
pslib_ptr_
->
_worker_ptr
->
clear
();
ret
.
wait
();
ret
.
wait
();
int32_t
err_code
=
ret
.
get
();
if
(
err_code
==
-
1
)
{
LOG
(
ERROR
)
<<
"Clear Model failed"
;
}
#else
#else
VLOG
(
0
)
<<
"FleetWrapper::ClearModel does nothing when no pslib"
;
VLOG
(
0
)
<<
"FleetWrapper::ClearModel does nothing when no pslib"
;
#endif
#endif
...
@@ -1120,6 +1161,10 @@ void FleetWrapper::ClearOneTable(const uint64_t table_id) {
...
@@ -1120,6 +1161,10 @@ void FleetWrapper::ClearOneTable(const uint64_t table_id) {
#ifdef PADDLE_WITH_PSLIB
#ifdef PADDLE_WITH_PSLIB
auto
ret
=
pslib_ptr_
->
_worker_ptr
->
clear
(
table_id
);
auto
ret
=
pslib_ptr_
->
_worker_ptr
->
clear
(
table_id
);
ret
.
wait
();
ret
.
wait
();
int32_t
err_code
=
ret
.
get
();
if
(
err_code
==
-
1
)
{
LOG
(
ERROR
)
<<
"Clear One Table failed table_id: "
<<
table_id
;
}
#else
#else
VLOG
(
0
)
<<
"FleetWrapper::ClearOneTable does nothing when no pslib"
;
VLOG
(
0
)
<<
"FleetWrapper::ClearOneTable does nothing when no pslib"
;
#endif
#endif
...
@@ -1179,6 +1224,10 @@ void FleetWrapper::ClientFlush() {
...
@@ -1179,6 +1224,10 @@ void FleetWrapper::ClientFlush() {
#ifdef PADDLE_WITH_PSLIB
#ifdef PADDLE_WITH_PSLIB
auto
ret
=
pslib_ptr_
->
_worker_ptr
->
flush
();
auto
ret
=
pslib_ptr_
->
_worker_ptr
->
flush
();
ret
.
wait
();
ret
.
wait
();
int32_t
err_code
=
ret
.
get
();
if
(
err_code
==
-
1
)
{
LOG
(
ERROR
)
<<
"Client Flush failed"
;
}
#else
#else
VLOG
(
0
)
<<
"FleetWrapper::ServerFlush does nothing when no pslib"
;
VLOG
(
0
)
<<
"FleetWrapper::ServerFlush does nothing when no pslib"
;
#endif
#endif
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录