Remove Input requirement in dygraph for Model #27557

LiuChiachi · 2020-09-25T05:46:37Z

PR types

New features

PR changes

APIs

Describe

1.移除了动态图下Model对inputs的需求, #27272
（如果动态图下提供inputs，保存预测模型将能够保存正确的输入shape，是完全正确的状态；如果动态图下不提供inputs也不需要保存预测模型，也不会有任何影响）
2.动态图下未指定inputs，并需要保存预测模型时：
1)未运行模型，直接保存：报错RuntimeError
2)运行model.fit, model.train_batch, model.eval_batch，或者model.test_batch之后可以保存预测模型，不报错，但报UserWarning，提示用户保存的不是确切的shape（不支持保存batch_size等可变输入维度），并提示用户输入inputs以保存更准确的input shape

… remove-input-requirment-in-dygraph-CModel

paddle-bot-old · 2020-09-25T05:46:43Z

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

… remove-input-requirment-in-dygraph-CModel

guoshengCS · 2020-09-28T05:48:58Z

python/paddle/hapi/model.py

+            if isinstance(inputs, list):
+                self._shapes = [list(input.shape) for input in inputs]
+            elif isinstance(inputs, dict):
+                self._shapes = [list(inputs[name]) for name in inputs]


这里是否是inputs[name].shape呢

是的，十分感谢~已经修改

guoshengCS · 2020-09-28T06:37:25Z

python/paddle/hapi/model.py

+                for i in range(len(data) - 1)
+            ]
+            self._is_shape_inferred = True
+            self._inputs = self._verify_spec(None, self._shapes, True)


_run_one_epoch 会调用train_batch等方法，应该不用在这里也另外实现这个功能

感谢指出，现已改正。会更仔细些

… remove-input-requirment-in-dygraph-CModel

Aurelius84 · 2020-09-28T07:32:05Z

python/paddle/hapi/model.py

@@ -598,6 +598,7 @@ def __init__(self, model):
            'test_batch': 0
        }

+        self._shapes = None


建议使用一个更达义的变量名，比如self._input_shapes

感谢指出，已修改

python/paddle/hapi/model.py

Aurelius84 · 2020-09-28T07:38:58Z

python/paddle/hapi/model.py

@@ -844,14 +849,21 @@ def __init__(self, network, inputs=None, labels=None):
        self._loss = None
        self._loss_weights = None
        self._optimizer = None
-        self._optimizer = None
+        self._shapes = None
+        self._is_shape_inferred = False


建议一个更达义的变量名替换self._shapes。这里如果成员变量inputs初始化后是不变的话，是否不需要一个额外的shape变量。只需要一个成员函数解析一下self._inputs即可？

如果保留这个shape变量的话，建议修改下变量名。

动、静态图下在Model初始化时都需要对self._inputs进行初始化，因为目前train_batch, eval_batch等也需要用到self._inputs。因此需要在动态图下用户没提供inputs时用self._input_shapes记录下在运行模型推导出的输入shape，以便能通过此次更新后的self._verify_spec根据shape获取一个可传递给paddle.to_static的较为合理的self._inputs

Aurelius84 · 2020-09-28T07:40:14Z

python/paddle/hapi/model.py

+                self._shapes = [list(input.shape) for input in inputs]
+            elif isinstance(inputs, dict):
+                self._shapes = [list(inputs[name].shape) for name in inputs]
+


如上个comment，elif的这部分逻辑其实可以抽离到一个成员函数里，用于解析inputs的shape

已修改，感谢~

Aurelius84 · 2020-09-28T07:46:25Z

python/paddle/hapi/model.py

@@ -947,7 +964,12 @@ def eval_batch(self, inputs, labels=None):
              loss = model.eval_batch([data], [label])
              print(loss)
        """
-        return self._adapter.eval_batch(inputs, labels)
+        loss = self._adapter.eval_batch(inputs, labels)


感谢~已修正

Aurelius84 · 2020-09-28T07:48:11Z

python/paddle/hapi/model.py

@@ -987,7 +1009,12 @@ def test_batch(self, inputs):
              out = model.test_batch([data])
              print(out)
        """
-        return self._adapter.test_batch(inputs)
+        loss = self._adapter.test_batch(inputs)


已修改，感谢

Aurelius84 · 2020-09-28T07:50:21Z

python/paddle/hapi/model.py

@@ -1677,6 +1704,14 @@ def get_inout_spec(all_vars, return_name=False):
        if fluid.in_dygraph_mode():
            with fluid.framework._dygraph_guard(None):
                layer = self.network
+                if self._shapes is None:  # No provided or inferred
+                    raise RuntimeError(
+                        "Saving inference model needs `inputs` or running before saving."


报错文案可以优化下。这里只给出了原因，也可以给出一些解决方式。比如：

提示用户指定inputs

可以输入数据，执行一次训练用于shape的推导。

感谢!已修改，在报错信息里进行了更详细的说明

Aurelius84 · 2020-09-28T07:53:19Z

python/paddle/hapi/model.py

+                    )
+                if self._is_shape_inferred:
+                    warnings.warn(
+                        'Saving actual input shapes only if `inputs` is provided, otherwise variable input dimension is immutable.'


这个报错文案是否可以优化下。这里warning信息里有两点要提示用户：

提醒用户Model里没有指定inputs，这里保存时将使用从实际数据推导出来的shape信息保存模型

打印出推导出来的shape信息，让用户知道自己保存的输入shape

Aurelius84 · 2020-09-28T07:54:26Z

python/paddle/hapi/model.py

+                        for i, n in enumerate(arg_names)
+                    ]
+                else:
+                    out_specs = [Input(name=n, shape=[None]) for n in arg_names]


这里的else分支应该可以去掉吧。直接返回空就可以了，后续依靠推导来得到。

train_batch, eval_batch目前会用到self._inputs，因此Model初始化时所初始化的self._inputs不能是None。

… remove-input-requirment-in-dygraph-CModel

saxon-zh

LGTM

LiuChiachi added 2 commits September 25, 2020 05:43

remove input requirment in dygraph Model

4c5dead

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

47e375a

… remove-input-requirment-in-dygraph-CModel

LiuChiachi added 15 commits September 25, 2020 05:47

correct unittest

5d2fad7

upadte save inference model in dygraph without input

f7f4063

fix unittets for test_model.py

87a1b53

solve conflicts

9048b14

solve conflicts

6396fce

solve conflicts

67bac48

delete http.log

8dcc03a

fix test_model.py bug, correct initialization of MyModel

cc71c7b

fix unittests bugs

7afd7d4

set paddle manual seed for unittest

707a421

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

c941c36

… remove-input-requirment-in-dygraph-CModel

fix Model bugs, because inputs can be list or dict when it is provided.

7d8d791

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

fc0943c

… remove-input-requirment-in-dygraph-CModel

add random seed for test_export_deploy_model

3e56bfb

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

16139dc

… remove-input-requirment-in-dygraph-CModel

guoshengCS reviewed Sep 28, 2020

View reviewed changes

LiuChiachi added 2 commits September 28, 2020 06:57

delete redundant codes, because calls

5ecba2a

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

7ab5cb6

… remove-input-requirment-in-dygraph-CModel

Aurelius84 reviewed Sep 28, 2020

View reviewed changes

LiuChiachi added 2 commits September 28, 2020 11:36

Code optimization, error information optimization

b151fba

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

9e9132d

… remove-input-requirment-in-dygraph-CModel

saxon-zh approved these changes Sep 28, 2020

View reviewed changes

guoshengCS approved these changes Sep 30, 2020

View reviewed changes

guoshengCS merged commit d15cbe7 into PaddlePaddle:develop Sep 30, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove Input requirement in dygraph for Model #27557

Remove Input requirement in dygraph for Model #27557

LiuChiachi commented Sep 25, 2020 •

edited

Loading

paddle-bot-old bot commented Sep 25, 2020

guoshengCS Sep 28, 2020

LiuChiachi Sep 28, 2020

guoshengCS Sep 28, 2020

LiuChiachi Sep 28, 2020

Aurelius84 Sep 28, 2020

LiuChiachi Sep 28, 2020

Aurelius84 Sep 28, 2020

LiuChiachi Sep 28, 2020

Aurelius84 Sep 28, 2020

LiuChiachi Sep 28, 2020

Aurelius84 Sep 28, 2020

LiuChiachi Sep 28, 2020

Aurelius84 Sep 28, 2020

LiuChiachi Sep 28, 2020

Aurelius84 Sep 28, 2020

LiuChiachi Sep 28, 2020

Aurelius84 Sep 28, 2020

Aurelius84 Sep 28, 2020

LiuChiachi Sep 28, 2020

saxon-zh left a comment

Remove Input requirement in dygraph for Model #27557

Remove Input requirement in dygraph for Model #27557

Conversation

LiuChiachi commented Sep 25, 2020 • edited Loading

PR types

PR changes

Describe

paddle-bot-old bot commented Sep 25, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

saxon-zh left a comment

Choose a reason for hiding this comment

LiuChiachi commented Sep 25, 2020 •

edited

Loading