Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
4c5dead6
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 2 年 前同步成功
通知
2325
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看板
提交
4c5dead6
编写于
9月 25, 2020
作者:
L
LiuChiaChi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove input requirment in dygraph Model
上级
77a36f89
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
6 deletion
+19
-6
python/paddle/hapi/model.py
python/paddle/hapi/model.py
+19
-6
未找到文件。
python/paddle/hapi/model.py
浏览文件 @
4c5dead6
...
...
@@ -792,14 +792,15 @@ class Model(object):
switched by `paddle.disable_static()`. The usage is as follows.
But note, the switching between dynamic and static should be before
instantiating a Model. The input description, i.e, paddle.static.InputSpec,
must be required.
must be required
for static graph
.
Args:
network (paddle.nn.Layer): The network is an instance of
paddle.nn.Layer.
inputs (InputSpec|list|dict|None): `inputs`, entry points of network,
could be a InputSpec instance, or lits of InputSpec instances,
or dict ({name: InputSpec}), and it couldn't be None.
or dict ({name: InputSpec}), and it couldn't be None in static
graph.
labels (InputSpec|list|None): `labels`, entry points of network,
could be a InputSpec instnace or lits of InputSpec instances,
or None. For static graph, if labels is required in loss,
...
...
@@ -848,9 +849,10 @@ class Model(object):
self
.
_optimizer
=
None
self
.
_test_dataloader
=
None
if
not
isinstance
(
inputs
,
(
list
,
dict
,
Input
)):
raise
TypeError
(
"'inputs' must be list or dict, and couldn't be None."
)
if
not
in_dygraph_mode
():
if
not
isinstance
(
inputs
,
(
list
,
dict
,
Input
)):
raise
TypeError
(
"'inputs' must be list or dict, and couldn't be None."
)
self
.
_inputs
=
self
.
_verify_spec
(
inputs
,
True
)
self
.
_labels
=
self
.
_verify_spec
(
labels
)
...
...
@@ -1863,7 +1865,18 @@ class Model(object):
def
_verify_spec
(
self
,
specs
,
is_input
=
False
):
out_specs
=
[]
if
isinstance
(
specs
,
dict
):
if
specs
is
None
:
# Note(Aurelius84): If not specific specs of `Input`, using argument names of `forward` function
# to generate `Input`. But how can we know the actual shape of each input tensor?
if
is_input
:
out_specs
=
[
Input
(
name
=
n
,
shape
=
[
None
])
for
n
in
extract_args
(
self
.
network
.
forward
)
if
n
!=
'self'
]
else
:
out_specs
=
to_list
(
specs
)
elif
isinstance
(
specs
,
dict
):
assert
is_input
==
False
out_specs
=
[
specs
[
n
]
\
for
n
in
extract_args
(
self
.
network
.
forward
)
if
n
!=
'self'
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录