[IPU] support dy2static for IPU merge code #43770

gglin001 · 2022-06-22T13:00:53Z

PR types

Others

PR changes

Others

Describe

clone of #42952

~~fix pre-commit CI~~

文档 PR PaddlePaddle/docs#4932

文档预览链接：http://10.136.157.23:8090/documentation/docs/zh/faq/index_cn.html?reviewVersion=jenkins-doc-review-2374

… ipu_commit/dy2static_ipu

paddle-bot-old · 2022-06-22T13:00:59Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

qili93

LGTM, code review in #42952

TCChenlong · 2022-06-23T07:56:48Z

python/paddle/fluid/layers/loss.py

+def identity_loss(x, reduction="none"):
+    r"""Marks a tensor as being part of the loss calculation for IPU.
+
+    This function should be called on the (final) loss of a model so that


~~This function~~

请删除 This function，文档里不这么描述。

抱歉, 之前以为这里是取消这里的 comment, will fix later

TCChenlong · 2022-06-23T07:59:04Z

python/paddle/fluid/layers/loss.py

+
+    Parameters:
+        x (Variable): The calculated loss ``Tensor``.
+        reduction(str|int): Reduce the loss output. The default value is "none". Supported values are:


reduction(str|int, optional)

请添加 reduction 为 int 时的说明。

fixed,

* ``"sum"``: Sum the losses.

to

* ``"sum"`` or ``1``: Sum the losses.

TCChenlong · 2022-06-24T06:39:52Z

python/paddle/fluid/layers/loss.py

+
+    This function should be called on the (final) loss of a model so that
+    it is used as the start of backpropagation. This is equivalent to calling
+    ``x.backward()`` on a tensor ``x`` when running on the CPU.


This is equivalent to calling x.backward() on a tensor x when running on the CPU. 中文文档没有；
此外，关于 reduction ，英文版在参数中进行说明，而中文在描述中与参数中都说明了；建议按中文版，在功能描述中说明 reduction 为 string/int 时的行为，在参数描述中，保留指定应用于输出结果的计算方式，可选的string值有: 'none', 'mean', 'sum' ，对应的int值分别为2，1，0 。默认为 'none'。即可

fixed;

去除了

This is equivalent to calling ``x.backward()`` on a tensor ``x`` when running on the CPU.

reduction 部分已应用建议的修改, 麻烦再看下还有没有其他的问题

gglin001 · 2022-06-27T07:29:20Z

CI PR-CI-CINN 的 fix 见

[CINN] Emergency Fix for Paddle-CINN CI Problem #43860

TCChenlong · 2022-06-27T09:26:23Z

python/paddle/fluid/layers/loss.py

+        Out = SUM(Out)
+
+    Parameters:
+        x (Variable): The calculated loss ``Tensor``.


这里需要与中文语义保持一致

更正为：

x (Variable): The input tensor. The shapes is [N, *], where N is batch size and `*` means any number of additional dimensions. It's data type should be float32, float64 on CPU and float16, float32 on IPU.

TCChenlong · 2022-06-27T09:27:35Z

python/paddle/fluid/layers/loss.py

+def identity_loss(x, reduction="none"):
+    r"""Marks a tensor as being part of the loss calculation for IPU.
+
+    This function should be called on the (final) loss of a model so that


请删除 This function，文档里不这么描述。

gglin001 · 2022-06-29T03:24:35Z

@TCChenlong hi, 麻烦有空再看下还有其他要修改的地方吗?

关联的 doc
PaddlePaddle/docs#4932

TCChenlong · 2022-06-29T06:42:17Z

python/paddle/fluid/layers/loss.py

+    Parameters:
+        x (Variable): The input tensor. The shapes is [N, *], where N is batch size and `*` means any number of
+             additional dimensions. It's data type should be float32, float64 on CPU and float16, float32 on IPU.
+        reduction(str|int): Reduce the loss output. Supported string values are: 'sum', 'mean', 'none'


reduction(str|int) -> reduction(str|int, optional)

已更改为 reduction(str|int, optional):

TCChenlong

LGTM

qili93

LGTM

XiaoguangHu01

LGMT

czr-gc and others added 15 commits May 24, 2022 13:38

feat(): dynamic_to_static support for ipu.

2e808f8

fix(): format fix.

7dc576d

fix format

b2c14b8

fix cpplint error

db3db60

use phi::errors

dde6057

Merge branch 'develop' into ipu_commit/dy2static_ipu

5914bb5

fix format

911b9da

fix format

39bc392

fix(): add api to restore patched function.

a11cc9e

fix(): identity_loss uses cpu place as expected kernel type.

6392d6d

doc(): add IPU dy2static related docs.

71e47d3

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

ea833fb

… ipu_commit/dy2static_ipu

fix(): combine test cases.

52f1e7d

Merge branch 'develop' into ipu_commit/dy2static_ipu

8a92115

fix format

108ccec

paddle-bot-old bot added contributor External developers status: proposed labels Jun 22, 2022

gglin001 mentioned this pull request Jun 22, 2022

[IPU] support dy2static for IPU #42952

Closed

qili93 marked this pull request as ready for review June 23, 2022 06:31

qili93 previously approved these changes Jun 23, 2022

View reviewed changes

gglin001 changed the title ~~[NO MERGE] [IPU] support dy2static for IPU~~ [IPU] support dy2static for IPU merge code Jun 23, 2022

TCChenlong reviewed Jun 23, 2022

View reviewed changes

fix comment

ab79428

gglin001 dismissed qili93’s stale review via ab79428 June 23, 2022 08:36

gglin001 added 2 commits June 23, 2022 21:30

Merge branch 'develop' into ipu_commit/dy2static_ipu_fix_format

3c83ae3

fix format

4c2b257

TCChenlong reviewed Jun 24, 2022

View reviewed changes

gglin001 added 2 commits June 24, 2022 15:02

apply comment

e70c133

Merge branch 'develop' into ipu_commit/dy2static_ipu_fix_format

b0395d4

fix compiling

1c804a4

TCChenlong reviewed Jun 27, 2022

View reviewed changes

czr-gc added 3 commits June 27, 2022 17:51

fix(): align docs.

8ff045a

fix(): fix identity_loss function docs.

13f161e

fix(): adjust mean and sum in identity_loss.

7bb90b7

TCChenlong reviewed Jun 29, 2022

View reviewed changes

fix(): minor docs.

709bd59

TCChenlong previously approved these changes Jun 29, 2022

View reviewed changes

gglin001 added 2 commits July 4, 2022 12:17

Merge branch 'develop' into ipu_commit/dy2static_ipu_fix_format

63232a8

move API to paddle.incubate.identity_loss

305fefe

gglin001 dismissed TCChenlong’s stale review via 305fefe July 4, 2022 04:18

fix UT

732525e

qili93 approved these changes Jul 7, 2022

View reviewed changes

XiaoguangHu01 approved these changes Jul 7, 2022

View reviewed changes

TCChenlong approved these changes Jul 7, 2022

View reviewed changes

qili93 merged commit 6984fbc into PaddlePaddle:develop Jul 7, 2022

gglin001 deleted the ipu_commit/dy2static_ipu_fix_format branch July 7, 2022 05:17

paddle-bot-old bot removed the contributor External developers label Oct 17, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[IPU] support dy2static for IPU merge code #43770

[IPU] support dy2static for IPU merge code #43770

gglin001 commented Jun 22, 2022 •

edited by qili93

Loading

paddle-bot-old bot commented Jun 22, 2022

qili93 left a comment

TCChenlong Jun 23, 2022

TCChenlong Jun 27, 2022

gglin001 Jun 27, 2022

TCChenlong Jun 23, 2022

gglin001 Jun 23, 2022

TCChenlong Jun 24, 2022

gglin001 Jun 24, 2022

gglin001 commented Jun 27, 2022 •

edited

Loading

TCChenlong Jun 27, 2022

czr-gc Jun 27, 2022

TCChenlong Jun 27, 2022

gglin001 commented Jun 29, 2022

TCChenlong Jun 29, 2022

czr-gc Jun 29, 2022

TCChenlong left a comment

qili93 left a comment

XiaoguangHu01 left a comment

[IPU] support dy2static for IPU merge code #43770

[IPU] support dy2static for IPU merge code #43770

Conversation

gglin001 commented Jun 22, 2022 • edited by qili93 Loading

PR types

PR changes

Describe

paddle-bot-old bot commented Jun 22, 2022

qili93 left a 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

gglin001 commented Jun 27, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gglin001 commented Jun 29, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TCChenlong left a comment

Choose a reason for hiding this comment

qili93 left a comment

Choose a reason for hiding this comment

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

gglin001 commented Jun 22, 2022 •

edited by qili93

Loading

gglin001 commented Jun 27, 2022 •

edited

Loading