update samples of print and clip api, test=develop by qili93 · Pull Request #27670 · PaddlePaddle/Paddle

qili93 · 2020-09-28T07:40:43Z

PR types

Others

PR changes

Docs

Describe

Change the code samples of the following API:

paddle.static.Print
paddle.nn.GradientClipByValue
paddle.nn.GradientClipByNorm
paddle.nn.GradientClipByGlobalNorm

Fluid Doc PR: PaddlePaddle/docs#2714

paddle-bot-old · 2020-09-28T07:40:49Z

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

… print_clip_api

phlrain

LGTM for core.ops issue

TCChenlong · 2020-09-29T02:09:27Z

python/paddle/fluid/layers/control_flow.py

+           main_program = paddle.static.default_main_program()
+           exe = paddle.static.Executor(place=paddle.CPUPlace())
+           res = exe.run(main_program, fetch_list=[out])
+           # Variable: fill_constant_1.tmp_0


Variable -> Tensor

确认过，静态图还是Variable，不用修改

TCChenlong · 2020-09-29T02:09:33Z

python/paddle/fluid/layers/control_flow.py

-           main_program = fluid.default_main_program()
-           exe = fluid.Executor(fluid.CPUPlace())
-           exe.run(main_program)
+           import paddle


225- 257 中 Variable-> Tensor

确认过，静态图还是Variable，不用修改

TCChenlong · 2020-09-29T02:10:16Z

python/paddle/fluid/clip.py


    Gradient clip will takes effect after being set in ``optimizer`` , see the document ``optimizer`` 
-    (for example: :ref:`api_fluid_optimizer_SGDOptimizer`).
+    (for example: :ref:`api_fluid_optimizer_SGD`).


161-163 alias 相关可以删除

TCChenlong · 2020-09-29T02:12:03Z

python/paddle/fluid/clip.py

+
+            paddle.disable_static()
+
+            in_np = np.random.uniform(-1, 1, [10, 10]).astype("float32")


请用paddle.uniform 最好别用numpy~

TCChenlong · 2020-09-29T02:12:48Z

python/paddle/fluid/clip.py

+            # clip = paddle.nn.GradientClipByValue(min=-1, max=1, need_clip=fileter_func)
+
+            sdg = paddle.optimizer.SGD(learning_rate=0.1, parameters=linear.parameters(), grad_clip=clip)
+            sdg.minimize(loss)


sdg.step()吧

参考SDG的文档，以及原有的sample，还是保持minimize
https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/api/paddle/fluid/optimizer/SGDOptimizer_cn.html

已修改为sdg.step()

TCChenlong · 2020-09-29T02:20:15Z

python/paddle/fluid/clip.py

            and gradients of all parameters in the network will be clipped.

-    Examples:
+    Code Example (DyGraph Mode)


TCChenlong · 2020-09-29T02:21:23Z

python/paddle/fluid/clip.py


    Gradient clip will takes effect after being set in ``optimizer`` , see the document ``optimizer`` 
-    (for example: :ref:`api_fluid_optimizer_SGDOptimizer`).
+    (for example: :ref:`api_fluid_optimizer_SGD`).


457-459可以删除

TCChenlong · 2020-09-29T02:21:38Z

python/paddle/fluid/clip.py

            and gradients of all parameters in the network will be clipped.

-    Examples:
+    Code Example (DyGraph Mode):


TCChenlong · 2020-09-29T02:22:08Z

python/paddle/fluid/clip.py

-            x = np.random.uniform(-100, 100, (10, 2)).astype('float32')
-            exe.run(startup_prog)
-            out = exe.run(main_prog, feed={'x': x}, fetch_list=loss)
+            in_np = np.random.uniform(-1, 1, [10, 10]).astype("float32")


TCChenlong · 2020-09-29T02:22:25Z

python/paddle/fluid/clip.py

-                loss = fluid.layers.reduce_mean(out)
-                loss.backward()
+            sdg = paddle.optimizer.SGD(learning_rate=0.1, parameters=linear.parameters(), grad_clip=clip)
+            sdg.minimize(loss)


参考SDG的文档，以及原有的sample，还是保持minimize
https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/api/paddle/fluid/optimizer/SGDOptimizer_cn.html

已修改为sdg.step()

hong19860320

LGTM

… print_clip_api

TCChenlong · 2020-09-29T04:01:41Z

python/paddle/fluid/clip.py

-            # use for Static mode
            import paddle
-            import paddle.fluid as fluid
            import numpy as np


这行可以删了

TCChenlong · 2020-09-29T04:01:51Z

python/paddle/fluid/clip.py

-                sgd_optimizer = fluid.optimizer.SGD(
-                    learning_rate=0.1, parameter_list=linear.parameters(), grad_clip=clip)
-                sgd_optimizer.minimize(loss)
+            paddle.disable_static()


这行也可以删了

TCChenlong · 2020-09-29T04:02:02Z

python/paddle/fluid/clip.py

-            # use for Static mode
            import paddle
-            import paddle.fluid as fluid
            import numpy as np


TCChenlong · 2020-09-29T04:02:08Z

python/paddle/fluid/clip.py

-            out = exe.run(main_prog, feed={'x': x}, fetch_list=loss)
-

+            paddle.disable_static()


TCChenlong · 2020-09-29T04:02:21Z

python/paddle/fluid/clip.py

-            # use for Static mode
            import paddle
-            import paddle.fluid as fluid
            import numpy as np


TCChenlong · 2020-09-29T04:02:28Z

python/paddle/fluid/clip.py

-                sgd_optimizer = fluid.optimizer.SGD(
-                    learning_rate=0.1, parameter_list=linear.parameters(), grad_clip=clip)
-                sgd_optimizer.minimize(loss)
+            paddle.disable_static()


TCChenlong

LGTM

phlrain

LGTM for core.ops issue

hong19860320

LGTM

qili93 mentioned this pull request Sep 28, 2020

[DOC] print and clip api, test=develop PaddlePaddle/docs#2714

Merged

qili93 added 2 commits September 28, 2020 11:28

update samples of print and clip api, test=document_fix

b6e744a

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

b63ab5b

… print_clip_api

qili93 force-pushed the print_clip_api branch from 58e17af to b63ab5b Compare September 28, 2020 11:28

qili93 added 2 commits September 28, 2020 11:36

update sdg ref, test=document_fix

ec10040

update sdg ref link, test=document_fix

a00e7cb

phlrain previously approved these changes Sep 29, 2020

View reviewed changes

TCChenlong reviewed Sep 29, 2020

View reviewed changes

hong19860320 previously approved these changes Sep 29, 2020

View reviewed changes

qili93 added 2 commits September 29, 2020 02:57

address review comments, test=document_fix

2083bd7

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

43dd36d

… print_clip_api

qili93 dismissed stale reviews from hong19860320 and phlrain via 43dd36d September 29, 2020 02:58

address review comments, test=document_fix

91da99f

TCChenlong reviewed Sep 29, 2020

View reviewed changes

address review comments, test=document_fix

a07bdab

TCChenlong approved these changes Sep 29, 2020

View reviewed changes

phlrain self-requested a review September 29, 2020 06:32

phlrain approved these changes Sep 29, 2020

View reviewed changes

hong19860320 approved these changes Sep 29, 2020

View reviewed changes

zhupengyang merged commit 4d79304 into PaddlePaddle:develop Sep 30, 2020

qili93 deleted the print_clip_api branch September 30, 2020 02:45


		paddle.disable_static()

		in_np = np.random.uniform(-1, 1, [10, 10]).astype("float32")

		out = exe.run(main_prog, feed={'x': x}, fetch_list=loss)


		paddle.disable_static()

Conversation

qili93 commented Sep 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR types

PR changes

Describe

Uh oh!

paddle-bot-old bot commented Sep 28, 2020

Uh oh!

phlrain left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hong19860320 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

qili93 commented Sep 28, 2020 •

edited

Loading