Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzpei9
Paddle
提交
f5434507
P
Paddle
项目概览
wzpei9
/
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,发现更多精彩内容 >>
提交
f5434507
编写于
12月 10, 2018
作者:
X
Xin Pan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix control_flow ops in outs
test=develop
上级
0e3048db
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
13 deletion
+30
-13
python/paddle/fluid/framework.py
python/paddle/fluid/framework.py
+22
-7
python/paddle/fluid/layers/control_flow.py
python/paddle/fluid/layers/control_flow.py
+8
-6
未找到文件。
python/paddle/fluid/framework.py
浏览文件 @
f5434507
...
...
@@ -1040,19 +1040,15 @@ class Block(object):
raise
ValueError
(
"var %s not in this block"
%
name
)
return
v
def
_var_recursive
(
self
,
name
):
def
_
find_
var_recursive
(
self
,
name
):
"""
Get a Variable by name from this block recursively.
Args:
name(str): the Variable's name.
Raises:
ValueError: this block and this parent block doesn't
have a Variable with the giving name.
Returns:
Variable: the Variable with the giving name.
Variable: the Variable with the giving name.
Or None if not found.
"""
frontier
=
list
()
visited
=
set
()
...
...
@@ -1078,8 +1074,27 @@ class Block(object):
frontier
.
append
(
prog
.
block
(
cur
.
forward_block_idx
))
visited
.
add
(
id
(
cur
))
return
None
raise
ValueError
(
"Var {0} is not found recursively"
.
format
(
name
))
def
_var_recursive
(
self
,
name
):
"""
Get a Variable by name from this block recursively.
Args:
name(str): the Variable's name.
Raises:
ValueError: this block and this parent block doesn't
have a Variable with the giving name.
Returns:
Variable: the Variable with the giving name.
"""
var
=
self
.
_find_var_recursive
(
name
)
if
var
:
return
var
else
:
raise
ValueError
(
"Var {0} is not found recursively"
.
format
(
name
))
def
all_parameters
(
self
):
return
list
(
self
.
iter_parameters
())
...
...
python/paddle/fluid/layers/control_flow.py
浏览文件 @
f5434507
...
...
@@ -717,8 +717,9 @@ class While(object):
out_vars
=
[]
for
inner_out_name
in
inner_outputs
:
if
inner_out_name
in
parent_block
.
vars
:
out_vars
.
append
(
parent_block
.
var
(
inner_out_name
))
inner_var
=
parent_block
.
_find_var_recursive
(
inner_out_name
)
if
inner_var
:
out_vars
.
append
(
inner_var
)
step_scope
=
parent_block
.
create_var
(
type
=
core
.
VarDesc
.
VarType
.
STEP_SCOPES
)
...
...
@@ -1264,10 +1265,11 @@ class ConditionalBlock(object):
if
each_name
not
in
input_set
]
out_list
=
[
parent_block
.
var
(
var_name
)
for
var_name
in
parent_block
.
vars
if
var_name
in
intermediate
]
out_list
=
[]
for
inner_out_name
in
intermediate
:
inner_var
=
parent_block
.
_find_var_recursive
(
inner_out_name
)
if
inner_var
:
out_list
.
append
(
inner_var
)
step_scope
=
parent_block
.
create_var
(
type
=
core
.
VarDesc
.
VarType
.
STEP_SCOPES
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录