Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
55ce6969
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
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看板
未验证
提交
55ce6969
编写于
9月 24, 2019
作者:
C
chengduo
提交者:
GitHub
9月 24, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
clean tensor array (#19930)
test=develop
上级
57606205
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
1 deletion
+23
-1
paddle/fluid/framework/details/scope_buffered_ssa_graph_executor.cc
...id/framework/details/scope_buffered_ssa_graph_executor.cc
+18
-1
paddle/fluid/framework/details/scope_buffered_ssa_graph_executor.h
...uid/framework/details/scope_buffered_ssa_graph_executor.h
+5
-0
未找到文件。
paddle/fluid/framework/details/scope_buffered_ssa_graph_executor.cc
浏览文件 @
55ce6969
...
@@ -74,7 +74,8 @@ FeedFetchList ScopeBufferedSSAGraphExecutor::Run(
...
@@ -74,7 +74,8 @@ FeedFetchList ScopeBufferedSSAGraphExecutor::Run(
}
}
++
drop_scope_counter_
;
++
drop_scope_counter_
;
if
(
drop_scope_counter_
==
strategy_
.
num_iteration_per_drop_scope_
)
{
if
(
drop_scope_counter_
==
strategy_
.
num_iteration_per_drop_scope_
||
DropScopeOrNot
())
{
DropLocalExeScopes
();
DropLocalExeScopes
();
}
}
...
@@ -93,6 +94,19 @@ FeedFetchList ScopeBufferedSSAGraphExecutor::Run(
...
@@ -93,6 +94,19 @@ FeedFetchList ScopeBufferedSSAGraphExecutor::Run(
}
}
}
}
bool
ScopeBufferedSSAGraphExecutor
::
DropScopeOrNot
()
const
{
for
(
auto
&
var
:
tensor_array_vars_
)
{
auto
tensor_array
=
var
->
GetMutable
<
LoDTensorArray
>
();
for
(
LoDTensor
&
tensor
:
*
tensor_array
)
{
if
(
tensor
.
IsInitialized
())
{
return
true
;
}
}
tensor_array
->
clear
();
}
return
false
;
}
void
ScopeBufferedSSAGraphExecutor
::
InitVariables
()
{
void
ScopeBufferedSSAGraphExecutor
::
InitVariables
()
{
for
(
auto
&
info
:
tmp_var_infos_
)
{
for
(
auto
&
info
:
tmp_var_infos_
)
{
for
(
auto
&
pair
:
info
)
{
for
(
auto
&
pair
:
info
)
{
...
@@ -165,6 +179,9 @@ void ScopeBufferedSSAGraphExecutor::PrepareLocalExeScopes() {
...
@@ -165,6 +179,9 @@ void ScopeBufferedSSAGraphExecutor::PrepareLocalExeScopes() {
Variable
*
tmp_var
=
local_scope
->
Var
(
info
.
name_
);
Variable
*
tmp_var
=
local_scope
->
Var
(
info
.
name_
);
preserve_vars_
[
idx
].
emplace
(
tmp_var
);
preserve_vars_
[
idx
].
emplace
(
tmp_var
);
tmp_var_infos_
[
idx
].
emplace_back
(
tmp_var
,
info
.
type_
);
tmp_var_infos_
[
idx
].
emplace_back
(
tmp_var
,
info
.
type_
);
if
(
info
.
type_
==
proto
::
VarType
::
LOD_TENSOR_ARRAY
)
{
tensor_array_vars_
.
emplace_back
(
tmp_var
);
}
}
}
}
}
}
}
...
...
paddle/fluid/framework/details/scope_buffered_ssa_graph_executor.h
浏览文件 @
55ce6969
...
@@ -61,6 +61,8 @@ class ScopeBufferedSSAGraphExecutor : public SSAGraphExecutor {
...
@@ -61,6 +61,8 @@ class ScopeBufferedSSAGraphExecutor : public SSAGraphExecutor {
private:
private:
void
InitVariables
();
void
InitVariables
();
bool
DropScopeOrNot
()
const
;
size_t
drop_scope_counter_
{
0
};
size_t
drop_scope_counter_
{
0
};
ExecutionStrategy
strategy_
;
ExecutionStrategy
strategy_
;
std
::
unique_ptr
<
SSAGraphExecutor
>
underlying_executor_
;
std
::
unique_ptr
<
SSAGraphExecutor
>
underlying_executor_
;
...
@@ -71,8 +73,11 @@ class ScopeBufferedSSAGraphExecutor : public SSAGraphExecutor {
...
@@ -71,8 +73,11 @@ class ScopeBufferedSSAGraphExecutor : public SSAGraphExecutor {
std
::
vector
<
std
::
vector
<
std
::
pair
<
Variable
*
,
proto
::
VarType
::
Type
>>>
std
::
vector
<
std
::
vector
<
std
::
pair
<
Variable
*
,
proto
::
VarType
::
Type
>>>
tmp_var_infos_
;
tmp_var_infos_
;
std
::
vector
<
Variable
*>
tensor_array_vars_
;
std
::
vector
<
VariableInfo
>
var_infos_
;
std
::
vector
<
VariableInfo
>
var_infos_
;
std
::
vector
<
platform
::
Place
>
places_
;
std
::
vector
<
platform
::
Place
>
places_
;
ScopeBufferedMonitor
scope_monitor_
;
ScopeBufferedMonitor
scope_monitor_
;
};
};
}
// namespace details
}
// namespace details
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录