Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OPTHREE
Paddle
提交
103407aa
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,发现更多精彩内容 >>
提交
103407aa
编写于
4月 03, 2018
作者:
L
Luo Tao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine sync_with_cpp when remove ops or remove vars
上级
faa752a4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
37 addition
and
4 deletion
+37
-4
python/paddle/fluid/framework.py
python/paddle/fluid/framework.py
+18
-0
python/paddle/fluid/tests/unittests/test_protobuf_descs.py
python/paddle/fluid/tests/unittests/test_protobuf_descs.py
+19
-4
未找到文件。
python/paddle/fluid/framework.py
浏览文件 @
103407aa
...
...
@@ -847,6 +847,11 @@ class Block(object):
if
not
self
.
has_var
(
var
.
name
()):
self
.
create_var
(
name
=
var
.
name
(),
desc
=
var
,
type
=
var
.
type
())
# sync variables removed from c++ end
for
var
in
self
.
vars
.
keys
():
if
not
self
.
desc
.
find_var
(
var
):
self
.
vars
.
pop
(
var
)
# sync operators from cpp
ops_in_cpp
=
[]
for
op_idx
in
range
(
0
,
self
.
desc
.
op_size
()):
...
...
@@ -881,6 +886,19 @@ class Block(object):
op
=
Operator
(
self
,
op_desc
)
self
.
ops
.
append
(
op
)
# sync ops removed from c++ end
if
end_index
!=
-
1
and
end_index
<
len
(
self
.
ops
):
ops_in_cpp_index
=
0
ops_in_python_index
=
0
while
ops_in_python_index
<
len
(
self
.
ops
)
and
ops_in_cpp_index
<
len
(
ops_in_cpp
):
if
self
.
ops
[
ops_in_python_index
].
desc
!=
ops_in_cpp
[
ops_in_cpp_index
]:
del
self
.
ops
[
ops_in_python_index
]
else
:
ops_in_cpp_index
+=
1
ops_in_python_index
+=
1
assert
len
(
self
.
ops
)
==
len
(
ops_in_cpp
)
for
index
in
range
(
len
(
self
.
ops
)):
assert
self
.
ops
[
index
].
desc
==
ops_in_cpp
[
index
]
...
...
python/paddle/fluid/tests/unittests/test_protobuf_descs.py
浏览文件 @
103407aa
...
...
@@ -14,6 +14,7 @@
import
unittest
import
paddle.fluid.core
as
core
from
paddle.fluid.framework
import
Program
class
TestOpDesc
(
unittest
.
TestCase
):
...
...
@@ -187,32 +188,46 @@ class TestBlockDesc(unittest.TestCase):
self
.
assertEqual
(
all_ops
,
[
op0
,
op1
,
op2
])
def
test_remove_op
(
self
):
prog
=
core
.
ProgramDesc
()
program
=
Program
()
prog
=
program
.
desc
self
.
assertIsNotNone
(
prog
)
block
=
prog
.
block
(
0
)
self
.
assertIsNotNone
(
block
)
op0
=
block
.
append_op
()
op1
=
block
.
append_op
()
op2
=
block
.
append_op
()
op0
.
set_type
(
"test"
)
op1
.
set_type
(
"test"
)
op2
.
set_type
(
"test"
)
var0
=
block
.
var
(
"var0"
)
var1
=
block
.
var
(
"var1"
)
var2
=
block
.
var
(
"var2"
)
var3
=
block
.
var
(
"var3"
)
var4
=
block
.
var
(
"var4"
)
var5
=
block
.
var
(
"var5"
)
op0
.
set_input
(
"X"
,
[
"var0"
])
op0
.
set_output
(
"Y"
,
[
"var0"
])
op1
.
set_input
(
"X"
,
[
"var1"
,
"var2"
])
op1
.
set_output
(
"Y"
,
[
"var3"
,
"var4"
])
op2
.
set_input
(
"X"
,
[
"var1"
])
op2
.
set_output
(
"Y"
,
[
"var4"
,
"var5"
])
program
.
sync_with_cpp
()
# remove op1, its input var2 and output var3 will be removed at the same time,
# but its input var1 and output var4 will not be removed since they are used for op2.
block
.
remove_op
(
0
,
1
)
block
.
remove_op
(
1
,
2
)
program
.
sync_with_cpp
()
all_ops
=
[]
for
idx
in
xrange
(
0
,
block
.
op_size
()):
all_ops
.
append
(
block
.
op
(
idx
))
self
.
assertEqual
(
all_ops
,
[
op2
])
self
.
assertEqual
(
all_ops
,
[
op
0
,
op
2
])
all_vars
=
block
.
all_vars
()
self
.
assertEqual
(
set
(
all_vars
),
{
var1
,
var4
,
var5
})
self
.
assertEqual
(
set
(
all_vars
),
{
var
0
,
var
1
,
var4
,
var5
})
if
__name__
==
'__main__'
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录