Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
7f401224
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7f401224
编写于
3月 27, 2018
作者:
L
Luo Tao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
adjust remove rule for variables
上级
ccfec1bc
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
52 addition
and
35 deletion
+52
-35
paddle/fluid/framework/block_desc.cc
paddle/fluid/framework/block_desc.cc
+42
-31
paddle/fluid/framework/block_desc.h
paddle/fluid/framework/block_desc.h
+5
-0
python/paddle/fluid/tests/unittests/test_protobuf_descs.py
python/paddle/fluid/tests/unittests/test_protobuf_descs.py
+5
-4
未找到文件。
paddle/fluid/framework/block_desc.cc
浏览文件 @
7f401224
...
...
@@ -147,40 +147,51 @@ void BlockDesc::RemoveOp(size_t s, size_t e) {
if
(
ops_
.
begin
()
+
s
==
ops_
.
end
()
||
ops_
.
begin
()
+
e
==
ops_
.
end
())
{
return
;
}
auto
get_vars
=
[](
std
::
deque
<
std
::
unique_ptr
<
OpDesc
>>::
iterator
&
op
,
std
::
vector
<
std
::
string
>
&
v
)
{
auto
in_names
=
(
*
op
)
->
InputArgumentNames
();
v
.
insert
(
v
.
end
(),
in_names
.
begin
(),
in_names
.
end
());
auto
out_names
=
(
*
op
)
->
OutputArgumentNames
();
v
.
insert
(
v
.
end
(),
out_names
.
begin
(),
out_names
.
end
());
std
::
sort
(
v
.
begin
(),
v
.
end
());
auto
last
=
std
::
unique
(
v
.
begin
(),
v
.
end
());
v
.
erase
(
last
,
v
.
end
());
};
need_update_
=
true
;
std
::
vector
<
std
::
string
>
vars1
;
// input vars from delete ops
for
(
auto
it
=
ops_
.
begin
()
+
s
;
it
!=
ops_
.
begin
()
+
e
;
it
++
)
{
// delete all output vars
auto
out_names
=
(
*
it
)
->
OutputArgumentNames
();
for
(
auto
n
:
out_names
)
{
vars_
.
erase
(
vars_
.
find
(
n
));
for
(
size_t
i
=
s
;
i
<
e
;
i
++
)
{
// since remove op one by one, every time remove the first op.
auto
op
=
ops_
.
begin
()
+
s
;
// collect input and output variables from current delete op
std
::
vector
<
std
::
string
>
cur_vars
;
get_vars
(
op
,
cur_vars
);
// remove current op
ops_
.
erase
(
ops_
.
begin
()
+
s
);
// collect input and output variables from other ops
std
::
vector
<
std
::
string
>
other_vars
;
for
(
auto
it
=
ops_
.
begin
();
it
!=
ops_
.
end
();
it
++
)
{
get_vars
(
it
,
other_vars
);
}
// collect all input vars from remove ops
auto
in_names
=
(
*
it
)
->
InputArgumentNames
();
vars1
.
insert
(
vars1
.
end
(),
in_names
.
begin
(),
in_names
.
end
());
}
ops_
.
erase
(
ops_
.
begin
()
+
s
,
ops_
.
begin
()
+
e
);
// collect input and output vars from remain ops
std
::
vector
<
std
::
string
>
vars2
;
for
(
auto
it
=
ops_
.
begin
();
it
!=
ops_
.
end
();
it
++
)
{
auto
in_names
=
(
*
it
)
->
InputArgumentNames
();
auto
out_names
=
(
*
it
)
->
OutputArgumentNames
();
vars2
.
insert
(
vars2
.
end
(),
in_names
.
begin
(),
in_names
.
end
());
vars2
.
insert
(
vars2
.
end
(),
out_names
.
begin
(),
out_names
.
end
());
}
// delete input vars if no other op use it.
std
::
vector
<
std
::
string
>
del_vars
;
std
::
sort
(
vars1
.
begin
(),
vars1
.
end
());
std
::
unique
(
vars1
.
begin
(),
vars1
.
end
());
std
::
sort
(
vars2
.
begin
(),
vars2
.
end
());
std
::
unique
(
vars2
.
begin
(),
vars2
.
end
());
// del_vars = vars1 - vars1 ^ vars2
std
::
set_difference
(
vars1
.
begin
(),
vars1
.
end
(),
vars2
.
begin
(),
vars2
.
end
(),
std
::
inserter
(
del_vars
,
del_vars
.
end
()));
for
(
auto
it
=
del_vars
.
begin
();
it
!=
del_vars
.
end
();
it
++
)
{
vars_
.
erase
(
vars_
.
find
(
*
it
));
// variables should be deleted
std
::
vector
<
std
::
string
>
delete_vars
;
// delete_vars = cur_vars - cur_vars ^ other_input_vars
std
::
set_difference
(
cur_vars
.
begin
(),
cur_vars
.
end
(),
other_vars
.
begin
(),
other_vars
.
end
(),
std
::
inserter
(
delete_vars
,
delete_vars
.
end
()));
// remove variables
for
(
size_t
i
=
0
;
i
<
delete_vars
.
size
();
i
++
)
{
auto
name
=
delete_vars
[
i
];
auto
it
=
vars_
.
find
(
name
);
PADDLE_ENFORCE
(
it
!=
vars_
.
end
(),
"%s is not in variable list, it should not be deleted"
,
name
);
vars_
.
erase
(
it
);
VLOG
(
3
)
<<
"deleting variable "
<<
name
;
}
}
}
...
...
paddle/fluid/framework/block_desc.h
浏览文件 @
7f401224
...
...
@@ -89,6 +89,11 @@ class BlockDesc {
OpDesc
*
InsertOp
(
size_t
index
);
/*
* Remove Op and its input/output variables.
* Note that for either input or ouput variable, if it is also an input or
* output variable of other ops, we should remain it.
*/
void
RemoveOp
(
size_t
s
,
size_t
e
);
std
::
vector
<
OpDesc
*>
AllOps
()
const
;
...
...
python/paddle/fluid/tests/unittests/test_protobuf_descs.py
浏览文件 @
7f401224
...
...
@@ -197,13 +197,14 @@ class TestBlockDesc(unittest.TestCase):
var2
=
block
.
var
(
"var2"
)
var3
=
block
.
var
(
"var3"
)
var4
=
block
.
var
(
"var4"
)
var5
=
block
.
var
(
"var5"
)
op1
.
set_input
(
"X"
,
[
"var1"
,
"var2"
])
op1
.
set_output
(
"Y"
,
[
"var3"
])
op1
.
set_output
(
"Y"
,
[
"var3"
,
"var4"
])
op2
.
set_input
(
"X"
,
[
"var1"
])
op2
.
set_output
(
"Y"
,
[
"var4"
])
op2
.
set_output
(
"Y"
,
[
"var4"
,
"var5"
])
# remove op1, its input var2 and output var3 will be removed at the same time,
# but its input var1
will not be removed since var1 is also an input
for op2.
# but its input var1
and output var4 will not be removed since they are used
for op2.
block
.
remove_op
(
0
,
1
)
all_ops
=
[]
...
...
@@ -211,7 +212,7 @@ class TestBlockDesc(unittest.TestCase):
all_ops
.
append
(
block
.
op
(
idx
))
self
.
assertEqual
(
all_ops
,
[
op2
])
all_vars
=
block
.
all_vars
()
self
.
assertEqual
(
set
(
all_vars
),
{
var1
,
var4
})
self
.
assertEqual
(
set
(
all_vars
),
{
var1
,
var4
,
var5
})
if
__name__
==
'__main__'
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录