Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
e9d815e3
P
Paddle
项目概览
OPTHREE
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e9d815e3
编写于
3月 21, 2018
作者:
T
typhoonzero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
prepare and create op before run
上级
18461d09
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
8 deletion
+2
-8
paddle/fluid/operators/listen_and_serv_op.cc
paddle/fluid/operators/listen_and_serv_op.cc
+1
-8
paddle/fluid/operators/send_op.cc
paddle/fluid/operators/send_op.cc
+1
-0
未找到文件。
paddle/fluid/operators/listen_and_serv_op.cc
浏览文件 @
e9d815e3
...
...
@@ -99,7 +99,6 @@ class ListenAndServOp : public framework::OperatorBase {
blk_ctx_list
.
push_back
(
nullptr
);
// block0 is not used.
for
(
int
blkid
=
1
;
blkid
<
num_blocks
;
++
blkid
)
{
auto
*
exe_ctx
=
executor
.
Prepare
(
*
program
,
blkid
);
VLOG
(
2
)
<<
"prepare ctx: "
<<
exe_ctx
;
blk_ctx_list
.
push_back
(
exe_ctx
);
}
...
...
@@ -149,6 +148,7 @@ class ListenAndServOp : public framework::OperatorBase {
// should be global ops.
// NOTE: if is_gpu_place, CUDA kernels are laugched by multiple threads
// and this will still work.
std
::
vector
<
std
::
future
<
void
>>
fs
;
// block0 contains only listen_and_serv op, start run from block1.
for
(
int
blkid
=
1
;
blkid
<
num_blocks
-
1
;
++
blkid
)
{
...
...
@@ -156,13 +156,8 @@ class ListenAndServOp : public framework::OperatorBase {
[
&
executor
,
&
program
,
&
recv_scope
,
&
blk_ctx_list
,
blkid
]()
{
int
run_block
=
blkid
;
// thread local
try
{
VLOG
(
2
)
<<
"run ctx: "
<<
blk_ctx_list
[
run_block
]
<<
" block: "
<<
run_block
;
executor
.
RunPreparedContext
(
blk_ctx_list
[
run_block
],
&
recv_scope
,
false
,
false
);
// executor.Run(*program, &recv_scope, run_block,
// false /*create_local_scope*/,
// false /*create_vars*/);
}
catch
(
std
::
exception
&
e
)
{
LOG
(
ERROR
)
<<
"run sub program error "
<<
e
.
what
();
}
...
...
@@ -174,8 +169,6 @@ class ListenAndServOp : public framework::OperatorBase {
try
{
executor
.
RunPreparedContext
(
blk_ctx_list
[
num_blocks
-
1
],
&
recv_scope
,
false
,
false
);
// executor.Run(*program, &recv_scope, num_blocks - 1,
// false /*create_local_scope*/, false /*create_vars*/);
}
catch
(
std
::
exception
&
e
)
{
LOG
(
ERROR
)
<<
"run sub program error "
<<
e
.
what
();
}
...
...
paddle/fluid/operators/send_op.cc
浏览文件 @
e9d815e3
...
...
@@ -66,6 +66,7 @@ class SendOp : public framework::OperatorBase {
auto
*
client_var
=
scope
.
FindVar
(
client_var_name
);
detail
::
RPCClient
*
rpc_client
=
client_var
->
GetMutable
<
detail
::
RPCClient
>
();
ctx
.
Wait
();
// wait before sending
for
(
size_t
i
=
0
;
i
<
ins
.
size
();
i
++
)
{
if
(
NeedSend
(
scope
,
ins
[
i
]))
{
VLOG
(
3
)
<<
"sending "
<<
ins
[
i
]
<<
" to "
<<
epmap
[
i
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录