Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleHub
提交
40426b6f
P
PaddleHub
项目概览
PaddlePaddle
/
PaddleHub
大约 1 年 前同步成功
通知
282
Star
12117
Fork
2091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
200
列表
看板
标记
里程碑
合并请求
4
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleHub
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
200
Issue
200
列表
看板
标记
里程碑
合并请求
4
合并请求
4
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
40426b6f
编写于
3月 13, 2019
作者:
W
wuzewu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
don't clone the input program in default when connect program
上级
6c167379
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
10 addition
and
9 deletion
+10
-9
paddle_hub/tools/paddle_helper.py
paddle_hub/tools/paddle_helper.py
+10
-9
未找到文件。
paddle_hub/tools/paddle_helper.py
浏览文件 @
40426b6f
...
...
@@ -120,7 +120,7 @@ def from_flexible_data_to_param(flexible_data):
return
param
def
connect_program
(
pre_program
,
next_program
,
input_dict
=
None
):
def
connect_program
(
pre_program
,
next_program
,
input_dict
=
None
,
inplace
=
True
):
def
_copy_vars_and_ops_in_blocks
(
from_block
,
to_block
):
for
var
in
from_block
.
vars
:
var
=
from_block
.
var
(
var
)
...
...
@@ -149,7 +149,8 @@ def connect_program(pre_program, next_program, input_dict=None):
fluid
.
Program
),
"pre_program should be fluid.Program"
assert
isinstance
(
next_program
,
fluid
.
Program
),
"next_program should be fluid.Program"
new_program
=
pre_program
.
clone
()
output_program
=
pre_program
if
inplace
else
pre_program
.
clone
(
for_test
=
False
)
if
input_dict
:
assert
isinstance
(
input_dict
,
...
...
@@ -159,11 +160,11 @@ def connect_program(pre_program, next_program, input_dict=None):
var
,
fluid
.
framework
.
Variable
),
"the input_dict should be a dict with string-Variable pair"
var_info
=
copy
.
deepcopy
(
get_variable_info
(
var
))
input_var
=
new
_program
.
global_block
().
create_var
(
**
var_info
)
input_var
=
output
_program
.
global_block
().
create_var
(
**
var_info
)
output_var
=
next_program
.
global_block
().
var
(
key
)
var_info
=
copy
.
deepcopy
(
get_variable_info
(
output_var
))
output_var
=
new
_program
.
global_block
().
create_var
(
**
var_info
)
new
_program
.
global_block
().
append_op
(
output_var
=
output
_program
.
global_block
().
create_var
(
**
var_info
)
output
_program
.
global_block
().
append_op
(
type
=
"assign"
,
inputs
=
{
'X'
:
input_var
},
outputs
=
{
'Out'
:
output_var
})
...
...
@@ -172,17 +173,17 @@ def connect_program(pre_program, next_program, input_dict=None):
logger
.
info
(
"start to connect program"
)
for
index
,
block
in
enumerate
(
next_program
.
blocks
):
if
block
.
idx
==
0
:
_copy_vars_and_ops_in_blocks
(
block
,
new
_program
.
global_block
())
_copy_vars_and_ops_in_blocks
(
block
,
output
_program
.
global_block
())
else
:
block_map
[
index
]
=
len
(
new
_program
.
blocks
)
block_map
[
index
]
=
len
(
output
_program
.
blocks
)
logger
.
info
(
"block_%d in next_program merge into block_%d in pre_program"
%
(
index
,
block_map
[
index
]))
new_block
=
new
_program
.
_create_block
(
new_block
=
output
_program
.
_create_block
(
parent_idx
=
block_map
[
block
.
parent_idx
])
_copy_vars_and_ops_in_blocks
(
block
,
new_block
)
logger
.
info
(
"end of connect program"
)
return
new
_program
return
output
_program
def
remove_feed_fetch_op
(
program
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录