Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
极客李华
Paddle
提交
224f3bcb
P
Paddle
项目概览
极客李华
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
224f3bcb
编写于
12月 21, 2020
作者:
L
Leo Chen
提交者:
GitHub
12月 21, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
format code (#29714)
上级
97e29411
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
31 addition
and
13 deletion
+31
-13
paddle/fluid/framework/executor.cc
paddle/fluid/framework/executor.cc
+27
-13
paddle/fluid/framework/garbage_collector.h
paddle/fluid/framework/garbage_collector.h
+4
-0
未找到文件。
paddle/fluid/framework/executor.cc
浏览文件 @
224f3bcb
...
...
@@ -479,21 +479,35 @@ void Executor::RunPartialPreparedContext(ExecutorPrepareContext* ctx,
}
}
platform
::
DeviceContextPool
::
Instance
().
Get
(
place_
)
->
Wait
();
auto
callback
=
[
scope
,
local_scope
,
keep_kids
]()
{
if
(
local_scope
!=
scope
)
{
VLOG
(
4
)
<<
"Delete scope: "
<<
local_scope
;
scope
->
DeleteScope
(
local_scope
);
}
else
{
if
(
!
keep_kids
)
{
VLOG
(
4
)
<<
"Drop kids: "
<<
scope
;
// By default, we should delete all kid scopes after run executor
// because
// some operators may create local scope when running, such as while_op.
// But when while_op also create a local executor to run it's sub block,
// the sub scopes it created should not be dropped immediately, because
// while_grad_op will use some variables created during while_op run, so
// we need to keep the kids and wait for the outer executor to drop
// them.
scope
->
DropKids
();
}
VLOG
(
4
)
<<
"Keep kids: "
<<
scope
;
}
};
if
(
local_scope
!=
scope
)
{
scope
->
DeleteScope
(
local_scope
);
if
(
gc
)
{
VLOG
(
4
)
<<
"Async deleting scope"
;
gc
->
DirectClearCallback
(
callback
);
}
else
{
if
(
!
keep_kids
)
{
// By default, we should delete all kid scopes after run executor because
// some operators may create local scope when running, such as while_op.
// But when while_op also create a local executor to run it's sub block,
// the sub scopes it created should not be dropped immediately, because
// while_grad_op will use some variables created during while_op run, so
// we need to keep the kids and wait for the outer executor to drop them.
scope
->
DropKids
();
}
VLOG
(
4
)
<<
"Sync deleting scope"
;
platform
::
DeviceContextPool
::
Instance
().
Get
(
place_
)
->
Wait
();
callback
();
}
}
...
...
paddle/fluid/framework/garbage_collector.h
浏览文件 @
224f3bcb
...
...
@@ -48,6 +48,10 @@ class GarbageCollector {
template
<
typename
Container
,
typename
Callback
>
void
Add
(
Container
&&
objs
,
Callback
&&
callback
);
void
DirectClearCallback
(
const
std
::
function
<
void
()
>
&
callback
)
{
ClearCallback
(
callback
);
}
protected:
virtual
void
ClearCallback
(
const
std
::
function
<
void
()
>
&
callback
)
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录