Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
020d13c1
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看板
未验证
提交
020d13c1
编写于
9月 18, 2018
作者:
Q
Qiao Longfei
提交者:
GitHub
9月 18, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix dist table send hang problem (#13259)
* fix dist table send hang problem * revert sync_mode config * fix async send table
上级
2c31ea92
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
15 addition
and
6 deletion
+15
-6
python/paddle/fluid/transpiler/distribute_transpiler.py
python/paddle/fluid/transpiler/distribute_transpiler.py
+15
-6
未找到文件。
python/paddle/fluid/transpiler/distribute_transpiler.py
浏览文件 @
020d13c1
...
@@ -247,7 +247,7 @@ class DistributeTranspiler(object):
...
@@ -247,7 +247,7 @@ class DistributeTranspiler(object):
np
.
random
.
seed
(
self
.
origin_program
.
random_seed
)
np
.
random
.
seed
(
self
.
origin_program
.
random_seed
)
np
.
random
.
shuffle
(
grad_var_mapping_items
)
np
.
random
.
shuffle
(
grad_var_mapping_items
)
grad_name_to_send_dummy_out
=
dict
()
self
.
grad_name_to_send_dummy_out
=
dict
()
for
grad_varname
,
splited_vars
in
grad_var_mapping_items
:
for
grad_varname
,
splited_vars
in
grad_var_mapping_items
:
eplist
=
ps_dispatcher
.
dispatch
(
splited_vars
)
eplist
=
ps_dispatcher
.
dispatch
(
splited_vars
)
...
@@ -271,7 +271,7 @@ class DistributeTranspiler(object):
...
@@ -271,7 +271,7 @@ class DistributeTranspiler(object):
dummy_output
=
program
.
global_block
().
create_var
(
dummy_output
=
program
.
global_block
().
create_var
(
name
=
framework
.
generate_control_dev_var_name
())
name
=
framework
.
generate_control_dev_var_name
())
grad_name_to_send_dummy_out
[
grad_varname
]
=
dummy_output
self
.
grad_name_to_send_dummy_out
[
grad_varname
]
=
dummy_output
# get send op_role_var, if not splited, the grad should have .trainer suffix
# get send op_role_var, if not splited, the grad should have .trainer suffix
# if splited, grad should be the original grad var name (split_by_ref and send
# if splited, grad should be the original grad var name (split_by_ref and send
...
@@ -297,7 +297,12 @@ class DistributeTranspiler(object):
...
@@ -297,7 +297,12 @@ class DistributeTranspiler(object):
if
self
.
sync_mode
:
if
self
.
sync_mode
:
send_barrier_out
=
program
.
global_block
().
create_var
(
send_barrier_out
=
program
.
global_block
().
create_var
(
name
=
framework
.
generate_control_dev_var_name
())
name
=
framework
.
generate_control_dev_var_name
())
input_deps
=
grad_name_to_send_dummy_out
.
values
()
if
self
.
has_distributed_lookup_table
:
self
.
grad_name_to_send_dummy_out
[
self
.
table_name
]
=
program
.
global_block
().
create_var
(
name
=
framework
.
generate_control_dev_var_name
())
input_deps
=
self
.
grad_name_to_send_dummy_out
.
values
()
program
.
global_block
().
append_op
(
program
.
global_block
().
append_op
(
type
=
"send_barrier"
,
type
=
"send_barrier"
,
inputs
=
{
"X"
:
list
(
input_deps
)},
inputs
=
{
"X"
:
list
(
input_deps
)},
...
@@ -329,7 +334,7 @@ class DistributeTranspiler(object):
...
@@ -329,7 +334,7 @@ class DistributeTranspiler(object):
recv_dep_in
=
send_barrier_out
recv_dep_in
=
send_barrier_out
else
:
else
:
# connect deps to send op in async mode
# connect deps to send op in async mode
recv_dep_in
=
grad_name_to_send_dummy_out
[
recv_dep_in
=
self
.
grad_name_to_send_dummy_out
[
self
.
param_name_to_grad_name
[
param_varname
]]
self
.
param_name_to_grad_name
[
param_varname
]]
all_recv_outputs
.
extend
(
splited_var
)
all_recv_outputs
.
extend
(
splited_var
)
# get recv op_role_var, if not splited, the grad should have .trainer suffix
# get recv op_role_var, if not splited, the grad should have .trainer suffix
...
@@ -1046,9 +1051,13 @@ class DistributeTranspiler(object):
...
@@ -1046,9 +1051,13 @@ class DistributeTranspiler(object):
index
=
op_index
+
2
,
index
=
op_index
+
2
,
type
=
"send"
,
type
=
"send"
,
inputs
=
{
'X'
:
self
.
trainer_side_table_grad_list
},
inputs
=
{
'X'
:
self
.
trainer_side_table_grad_list
},
outputs
=
{
'Out'
:
[]},
outputs
=
{
'Out'
:
[
self
.
grad_name_to_send_dummy_out
[
self
.
table_name
]]
if
self
.
sync_mode
else
[]
},
attrs
=
{
attrs
=
{
"sync_mode"
:
Tru
e
,
"sync_mode"
:
Fals
e
,
"epmap"
:
pserver_endpoints
,
"epmap"
:
pserver_endpoints
,
RPC_OP_ROLE_ATTR_NAME
:
RPC_OP_ROLE_ATTR_VALUE
,
RPC_OP_ROLE_ATTR_NAME
:
RPC_OP_ROLE_ATTR_VALUE
,
OP_ROLE_VAR_ATTR_NAME
:
[
OP_ROLE_VAR_ATTR_NAME
:
[
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录