【Hackathon No.17】为 Paddle 新增 paddle.nn.CosineEmbeddingLoss 和 paddle.nn.functional.cosine_embedding_loss API #41680

Patrick-Star125 · 2022-04-12T04:43:04Z

PR types

Others

PR changes

APIs

Describe

解决了issue 【PaddlePaddle Hackathon 2】17、为 Paddle 新增 paddle.nn.CosineEmbeddingLoss 和 paddle.nn.functional.cosine_embedding_loss API #40316
增加了两个损失函数API paddle.nn.CosineEmbeddingLoss 和 paddle.nn.functional.cosine_embedding_loss
设计文档在【Hackathon No.17】 community#52
中文文档【PaddlePaddle Hackathon 】No.17 add docs for API CosineEmbeddingLoss docs#4737

CLAassistant · 2022-04-12T04:43:10Z

All committers have signed the CLA.

paddle-bot-old · 2022-04-12T04:43:16Z

你的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.

dingjiaweiww · 2022-04-13T01:44:15Z

请先通过CI检测噢~

Asthestarsfalll · 2022-04-16T14:46:32Z

scalar的问题貌似是之前的一个pr有问题，已经revert了，重新merge一下develop分支即可

paddle-bot-old · 2022-04-18T02:47:34Z

PR格式检查通过，你的PR将接受Paddle专家以及开源社区的review，请及时关注PR动态。
The format inspection passed. Your PR will be reviewed by experts of Paddle and developers from the open-source community. Stay tuned.

zoooo0820

当前CI有几个问题仍然需要关注：

Coverage：单测提示超时。请在保证覆盖率的前提下，适当减少功能重复或不必要的单测用例
Static：代码风格报错，请按提示修改，或者用pre-commit刷下格式

zoooo0820 · 2022-04-18T03:24:43Z

python/paddle/fluid/tests/unittests/test_cosine_embedding_loss.py

+from __future__ import print_function
+
+import paddle
+import paddle.fluid as fluid


因为fluid目前是非公开API并在逐步清理退场中。这里请不要使用fluid API，避免增加后续清理工作。静态图下相关API请参考paddle.static，设备相关检查请换用paddle.device.is_compiled_with_cuda()，paddle.CPUPlace等等

zoooo0820 · 2022-04-18T03:26:43Z

python/paddle/nn/functional/loss.py

+        elif reduction == 'sum':
+            return paddle.sum(scores)
+
+    fluid.data_feeder.check_variable_and_dtype(


同单测文件，这里也请不要显式使用fluid API。在文件开始引用了check_variable_and_dtype，这里直接使用这个就行，方便后续清理工作

zoooo0820 · 2022-04-18T03:30:29Z

python/paddle/nn/functional/loss.py

+        shape=[label.shape[0]],
+        dtype='{}'.format(label.dtype).replace("paddle.", ""),
+        value=0)
+    check_zero = fluid.layers.fill_constant(


同上，这里也请换用static下的api

zoooo0820 · 2022-04-18T03:43:38Z

python/paddle/fluid/tests/unittests/test_cosine_embedding_loss.py

+
+class TestFunctionCosineEmbeddingLoss(unittest.TestCase):
+    def setUp(self):
+        self.input1_np = np.random.random(size=(3, 3)).astype(np.float64)


单测中需要覆盖rfc设计文档中写到的测试用例，包括所有支持的dtype等

size可以适当设计一些不一样的case以及稍大的case

在我线下Windows paddle-gpu-0.0.0环境中，dtype为float32的计算result和numpy结果except如下图所示

差距在1e-8数量级上，应当是可以通过单测，但是不知道为什么只在window-inference中无法通过单测

出错代码在我上次commit中可以查看

…nto develop

jeff41404 · 2022-05-30T03:46:13Z

python/paddle/nn/functional/loss.py

@@ -2229,3 +2229,105 @@ def hinge_embedding_loss(input, label, margin=1.0, reduction='mean', name=None):
        return paddle.sum(loss, name=name)
    elif reduction == 'none':
        return loss
+
+
+def cosine_embedding_loss(input1, input2, label, margin=0, reduction='mean'):


The parameters of x1, x2, target in paddle.nn.functional.cosine_embedding_loss 's RFC must be same with parameters here.

According to the design requirements, our API requires the name parameter like other loss API.

Now changing parameters will lead to the modification of code and document. Can I just change x1, x2, target to input1, input2, label in RFC?

jeff41404 · 2022-05-30T03:50:53Z

python/paddle/nn/layer/loss.py

+
+    """
+
+    def __init__(self, margin=0, reduction='mean'):


According to the design requirements, our API requires the name parameter like other loss API.

Patrick-Star125 · 2022-06-01T08:46:12Z

已修改rfc，并且添加name参数及相关代码

TCChenlong · 2022-06-02T02:04:52Z

@Patrick-Star125 Code Style 检查还是错了，需要用 pre-commit ~

Patrick-Star125 · 2022-06-02T05:42:24Z

已修改

TCChenlong

LGTM

zoooo0820

LGTM

XiaoguangHu01

LGTM

add cosine embedding loss API

a2d6af5

paddle-bot-old bot added contributor External developers status: proposed labels Apr 12, 2022

Patrick-Star125 mentioned this pull request Apr 12, 2022

【PaddlePaddle Hackathon 第二期】任务总览 #40234

Closed

Patrick-Star125 added 4 commits April 12, 2022 16:49

stay new version

ea0bd15

new version

6cc16e7

new version

33003a7

new version

0854053

set label to int32

bde0cdc

Patrick-Star125 added 4 commits April 17, 2022 11:05

Merge remote-tracking branch 'refs/remotes/origin/develop' into develop

9352335

new version

5fb8bd1

new version-test

0f08a10

new version

999e94c

dingjiaweiww assigned betterpig and DDDivano Apr 18, 2022

dingjiaweiww added status: open review and removed status: proposed labels Apr 18, 2022

dingjiaweiww assigned zoooo0820 and unassigned betterpig Apr 18, 2022

zoooo0820 reviewed Apr 18, 2022

View reviewed changes

Patrick-Star125 and others added 4 commits April 18, 2022 15:36

new version

c080cfb

new version

358260f

Merge branch 'PaddlePaddle:develop' into develop

0e9a719

Merge branch 'develop' of https://github.com/Patrick-Star125/Paddle i…

ac2bdda

…nto develop

TCChenlong requested a review from DDDivano May 30, 2022 02:40

zoooo0820 previously approved these changes May 30, 2022

View reviewed changes

jeff41404 reviewed May 30, 2022

View reviewed changes

add name parameter

95217b8

Patrick-Star125 dismissed stale reviews from zoooo0820 and TCChenlong via 95217b8 May 31, 2022 06:24

resolve conflicts

2c8c224

TCChenlong closed this Jun 1, 2022

TCChenlong reopened this Jun 1, 2022

Patrick-Star125 added 2 commits June 1, 2022 16:43

activate CI

53a4366

Merge remote-tracking branch 'develop/develop' into develop

de8e7e6

fix format error

f08ff19

Patrick-Star125 added 3 commits June 5, 2022 15:56

sync with Paddle

ff13466

unit test code format

34dc781

format code

f861de4

TCChenlong requested review from zoooo0820, TCChenlong and jeff41404 June 7, 2022 01:49

TCChenlong approved these changes Jun 7, 2022

View reviewed changes

zoooo0820 approved these changes Jun 7, 2022

View reviewed changes

XiaoguangHu01 approved these changes Jun 7, 2022

View reviewed changes

jeff41404 merged commit 8dab269 into PaddlePaddle:develop Jun 8, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

【Hackathon No.17】为 Paddle 新增 paddle.nn.CosineEmbeddingLoss 和 paddle.nn.functional.cosine_embedding_loss API #41680

【Hackathon No.17】为 Paddle 新增 paddle.nn.CosineEmbeddingLoss 和 paddle.nn.functional.cosine_embedding_loss API #41680

Patrick-Star125 commented Apr 12, 2022 •

edited

CLAassistant commented Apr 12, 2022 •

edited

paddle-bot-old bot commented Apr 12, 2022

dingjiaweiww commented Apr 13, 2022

Asthestarsfalll commented Apr 16, 2022

paddle-bot-old bot commented Apr 18, 2022

zoooo0820 left a comment

zoooo0820 Apr 18, 2022

Patrick-Star125 Apr 20, 2022

zoooo0820 Apr 18, 2022 •

edited

Patrick-Star125 Apr 20, 2022

zoooo0820 Apr 18, 2022

Patrick-Star125 Apr 20, 2022

zoooo0820 Apr 18, 2022

Patrick-Star125 Apr 20, 2022 •

edited

jeff41404 May 30, 2022 •

edited

jeff41404 May 30, 2022

Patrick-Star125 May 30, 2022

jeff41404 May 30, 2022

Patrick-Star125 commented Jun 1, 2022

TCChenlong commented Jun 2, 2022

Patrick-Star125 commented Jun 2, 2022

TCChenlong left a comment

zoooo0820 left a comment

XiaoguangHu01 left a comment

【Hackathon No.17】为 Paddle 新增 paddle.nn.CosineEmbeddingLoss 和 paddle.nn.functional.cosine_embedding_loss API #41680

【Hackathon No.17】为 Paddle 新增 paddle.nn.CosineEmbeddingLoss 和 paddle.nn.functional.cosine_embedding_loss API #41680

Conversation

Patrick-Star125 commented Apr 12, 2022 • edited

PR types

PR changes

Describe

CLAassistant commented Apr 12, 2022 • edited

paddle-bot-old bot commented Apr 12, 2022

dingjiaweiww commented Apr 13, 2022

Asthestarsfalll commented Apr 16, 2022

paddle-bot-old bot commented Apr 18, 2022

zoooo0820 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zoooo0820 Apr 18, 2022 • edited

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

Patrick-Star125 Apr 20, 2022 • edited

Choose a reason for hiding this comment

jeff41404 May 30, 2022 • edited

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

Patrick-Star125 commented Jun 1, 2022

TCChenlong commented Jun 2, 2022

Patrick-Star125 commented Jun 2, 2022

TCChenlong left a comment

Choose a reason for hiding this comment

zoooo0820 left a comment

Choose a reason for hiding this comment

XiaoguangHu01 left a comment

Choose a reason for hiding this comment

Patrick-Star125 commented Apr 12, 2022 •

edited

CLAassistant commented Apr 12, 2022 •

edited

zoooo0820 Apr 18, 2022 •

edited

Patrick-Star125 Apr 20, 2022 •

edited

jeff41404 May 30, 2022 •

edited