Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
950301bf
P
Paddle
项目概览
PaddlePaddle
/
Paddle
接近 2 年 前同步成功
通知
2323
Star
20933
Fork
5424
代码
文件
提交
分支
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看板
未验证
提交
950301bf
编写于
9月 16, 2020
作者:
C
Chen Weihang
提交者:
GitHub
9月 16, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add input_spec & output_spec for TranslatedLayer (#27284)
* add input_spec & output_spec for translated_layer * update error message
上级
18fc9275
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
86 addition
and
16 deletion
+86
-16
python/paddle/fluid/dygraph/io.py
python/paddle/fluid/dygraph/io.py
+54
-15
python/paddle/fluid/tests/unittests/test_translated_layer.py
python/paddle/fluid/tests/unittests/test_translated_layer.py
+32
-1
未找到文件。
python/paddle/fluid/dygraph/io.py
浏览文件 @
950301bf
...
...
@@ -19,6 +19,7 @@ import six
import
pickle
import
numpy
as
np
import
paddle
from
paddle
import
compat
as
cpt
from
paddle.fluid
import
core
from
paddle.fluid
import
framework
...
...
@@ -182,9 +183,9 @@ class _ProgramHolder(object):
super
(
_ProgramHolder
,
self
).
__init__
()
# input, output, persistable var info
self
.
_input_names
=
[]
self
.
_persistable_names
=
[]
self
.
_input_descs
=
[]
self
.
_output_descs
=
[]
self
.
_persistable_names
=
[]
# execution scope
self
.
_inner_scope
=
core
.
Scope
()
...
...
@@ -207,11 +208,11 @@ class _ProgramHolder(object):
return
self
.
_train_program_desc
@
property
def
input_
name
s
(
self
):
return
self
.
_input_
name
s
def
input_
desc
s
(
self
):
return
self
.
_input_
desc
s
@
property
def
output_decs
(
self
):
def
output_de
s
cs
(
self
):
return
self
.
_output_descs
@
property
...
...
@@ -233,7 +234,8 @@ class _ProgramHolder(object):
ops_to_remove
.
append
(
i
)
feed_var_name
=
cpt
.
to_bytes
(
op
.
input
(
'X'
)[
0
])
root_block
.
_remove_var
(
feed_var_name
)
self
.
_input_names
.
append
(
cpt
.
to_bytes
(
op
.
output
(
'Out'
)[
0
]))
self
.
_input_descs
.
append
(
root_block
.
find_var
(
cpt
.
to_bytes
(
op
.
output
(
'Out'
)[
0
])))
elif
op
.
type
()
==
'scale'
and
op
.
output
(
'Out'
)[
0
].
startswith
(
'save_infer_model/scale_'
):
ops_to_remove
.
append
(
i
)
...
...
@@ -257,7 +259,7 @@ class _ProgramHolder(object):
root_block
.
_remove_op
(
op_idx
,
op_idx
+
1
)
# 2. Input processing, reverse feed vars
self
.
_input_
name
s
.
reverse
()
self
.
_input_
desc
s
.
reverse
()
# 3. Output processing, add scale for outputs
tmp_program
=
_build_program_by_desc
(
program_desc
)
...
...
@@ -738,7 +740,7 @@ class TranslatedLayer(layers.Layer):
if
isinstance
(
value
,
np
.
ndarray
):
var
=
core
.
VarBase
(
value
=
value
,
name
=
program_holder
.
input_
names
[
i
]
,
name
=
program_holder
.
input_
descs
[
i
].
name
()
,
persistable
=
False
,
place
=
framework
.
_current_expected_place
(),
zero_copy
=
True
)
...
...
@@ -746,7 +748,7 @@ class TranslatedLayer(layers.Layer):
var
=
value
# NOTE: we changed var name here,
# but it may be an important name set by user
var
.
name
=
program_holder
.
input_
names
[
i
]
var
.
name
=
program_holder
.
input_
descs
[
i
].
name
()
input_vars
.
append
(
var
)
persistable_vars
=
[]
...
...
@@ -762,7 +764,7 @@ class TranslatedLayer(layers.Layer):
%
var_name
)
output_vars
=
[]
for
var_desc
in
program_holder
.
output_decs
:
for
var_desc
in
program_holder
.
output_de
s
cs
:
var
=
core
.
VarBase
(
var_desc
.
dtype
(),
var_desc
.
shape
(),
var_desc
.
name
(),
var_desc
.
type
(),
False
)
...
...
@@ -913,11 +915,7 @@ class TranslatedLayer(layers.Layer):
program = translated_layer.program()
"""
# 1. get program holder
program_holder
=
self
.
_program_holder_dict
.
get
(
method_name
,
None
)
if
program_holder
is
None
:
raise
ValueError
(
"The method `%s` is not exists in loaded TranslatedLayer."
%
method_name
)
program_holder
=
self
.
_get_program_holder
(
method_name
)
# 2. get inference program desc
program_desc
=
program_holder
.
infer_program
...
...
@@ -925,3 +923,44 @@ class TranslatedLayer(layers.Layer):
# 3. construct program
program
=
_build_program_by_desc
(
program_desc
)
return
program
def
_get_program_holder
(
self
,
method_name
=
'forward'
):
program_holder
=
self
.
_program_holder_dict
.
get
(
method_name
,
None
)
if
program_holder
is
None
:
raise
ValueError
(
"The method `%s` does not exist in loaded TranslatedLayer."
%
method_name
)
return
program_holder
def
_input_spec
(
self
,
method_name
=
'forward'
):
# 1. get program holder
program_holder
=
self
.
_get_program_holder
(
method_name
)
# 2. build input spec by input desc
input_spec
=
[]
for
var_desc
in
program_holder
.
input_descs
:
spec
=
paddle
.
static
.
InputSpec
(
shape
=
var_desc
.
shape
(),
dtype
=
var_desc
.
dtype
(),
name
=
var_desc
.
name
())
input_spec
.
append
(
spec
)
return
input_spec
def
_output_spec
(
self
,
method_name
=
'forward'
):
# 1. get program holder
program_holder
=
self
.
_get_program_holder
(
method_name
)
# 2. build output spec by output desc
output_spec
=
[]
for
var_desc
in
program_holder
.
output_descs
:
# NOTE(chenweihang): InputSpec describes a tensor, not just input.
# Maybe the name is not good enough. Here we use InputSpec to
# construct the description of Output tensor
spec
=
paddle
.
static
.
InputSpec
(
shape
=
var_desc
.
shape
(),
dtype
=
var_desc
.
dtype
(),
name
=
var_desc
.
name
())
output_spec
.
append
(
spec
)
return
output_spec
python/paddle/fluid/tests/unittests/test_translated_layer.py
浏览文件 @
950301bf
...
...
@@ -49,7 +49,10 @@ class LinearNet(nn.Layer):
super
(
LinearNet
,
self
).
__init__
()
self
.
_linear
=
nn
.
Linear
(
IMAGE_SIZE
,
CLASS_NUM
)
@
paddle
.
jit
.
to_static
@
paddle
.
jit
.
to_static
(
input_spec
=
[
paddle
.
static
.
InputSpec
(
shape
=
[
None
,
IMAGE_SIZE
],
dtype
=
'float32'
,
name
=
'x'
)
])
def
forward
(
self
,
x
):
return
self
.
_linear
(
x
)
...
...
@@ -152,6 +155,34 @@ class TestTranslatedLayer(unittest.TestCase):
with
self
.
assertRaises
(
ValueError
):
program
=
translated_layer
.
program
(
'not_exists'
)
def
test_get_input_spec
(
self
):
# load
translated_layer
=
paddle
.
jit
.
load
(
self
.
model_path
)
expect_spec
=
[
paddle
.
static
.
InputSpec
(
shape
=
[
None
,
IMAGE_SIZE
],
dtype
=
'float32'
,
name
=
'x'
)
]
actual_spec
=
translated_layer
.
_input_spec
()
for
spec_x
,
spec_y
in
zip
(
expect_spec
,
actual_spec
):
self
.
assertEqual
(
spec_x
,
spec_y
)
def
test_get_output_spec
(
self
):
# load
translated_layer
=
paddle
.
jit
.
load
(
self
.
model_path
)
expect_spec
=
[
paddle
.
static
.
InputSpec
(
shape
=
[
None
,
CLASS_NUM
],
dtype
=
'float32'
,
name
=
'translated_layer/scale_0.tmp_1'
)
]
actual_spec
=
translated_layer
.
_output_spec
()
for
spec_x
,
spec_y
in
zip
(
expect_spec
,
actual_spec
):
self
.
assertEqual
(
spec_x
,
spec_y
)
if
__name__
==
'__main__'
:
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录