New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

【Hackathon 4th No.12】为 Paddle 新增 Cauchy API #52999

Merged

luotao1 merged 7 commits into PaddlePaddle:develop from megemini:cauchy_api

Apr 28, 2023

Contributor

megemini commented Apr 17, 2023 •

edited by luotao1

PR types

New features

PR changes

APIs

Description

[used AI Studio]

飞桨黑客马拉松第四期 No.12：为 Paddle 新增 Cauchy API
涉及以下5个文件:
- __init__.py: 将 Cauchy 添加到 distribution 目录下
- cauchy.py: Cauchy API 的具体实现
- kl.py: 添加 Cauchy 对应的 kl_divergence 方法
- test_distribution_cauchy.py: 动态图单元测试，含kl.py
- test_distribution_cauchy_static.py: 静态图单元测试，含kl.py

其他说明：

以上代码通过 pre-commit
以上代码已经在 AI Studio 测试通过
自测代码覆盖率 90%+

@luotao1 @cxxly @Ligoml @dasenCoding

谢谢评审！

中文文档：PaddlePaddle/docs#5807

RFC：@dasenCoding

【Hackathon 4th No.12】为 paddle 新增 paddle.distribution.Cauchy 分布 community#375

p.s. 2023-4-25 Update

修改测试用例目录。
增加部分动态图测试用例，目前coverage 100%。
修改部分测试用例，适配 to_tensor 默认 0D 而不是 1D 的行为。

请评审，谢谢！：）

p.s. 2023-4-21 Update

参考review重写了 __init__ 方法。
不使用 check_type ，改用 isinstance 做类型检查。
去掉取值范围的检查。
对应修改相应测试用例。

请评审，谢谢！：）


          【Hackathon 4th No.12】为 Paddle 新增 Cauchy API

2b73342

paddle-bot bot commented Apr 17, 2023

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

paddle-bot bot added contributor status: proposed labels

luotao1 assigned luotao1, cxxly and Ligoml

luotao1 added the API label

paddle-bot bot removed the status: proposed label

This was referenced Apr 18, 2023

【Hackathon 4th No.12】为 Paddle 新增 Cauchy API -- Cauchy doc PaddlePaddle/docs#5807

Merged

【PaddlePaddle Hackathon 第四期】任务总览 #51281

Closed

cxxly reviewed

View reviewed changes

python/paddle/distribution/cauchy.py

+              from paddle.fluid.data_feeder import check_type, convert_dtype
+              from paddle.fluid.framework import _non_static_mode
+              from paddle.fluid.layers import tensor

Contributor

cxxly Apr 20, 2023

导入规范遵循pep8，不意见直接导入函数、类

cxxly reviewed

View reviewed changes

python/paddle/distribution/cauchy.py

+                              'scale',
+                              (float, tensor.Variable),
+                              'Cauchy',
+                          )

Contributor

cxxly Apr 20, 2023 •

edited

直接使用 isinstance(loc, (numbers.Real, framework.Variable)) 进行类型检查没，不需要if not _non_static_mode()判断

cxxly reviewed

View reviewed changes

python/paddle/distribution/cauchy.py Outdated

+                          self.scale = scale
+                          self.dtype = convert_dtype(loc.dtype)
+                      else:
+                          [self.loc, self.scale] = self._to_tensor(loc, scale)

Contributor

cxxly Apr 20, 2023

distribution._validate_args, distribution._to_tensor是遗留API，存在缺陷，建议参考 gumbel.py 写法

cxxly reviewed

View reviewed changes

python/paddle/distribution/cauchy.py Outdated

+                      if _non_static_mode():
+                          """Not use `paddle.any` in static mode, which always be `True`."""
+                          if paddle.any(self.scale <= 0):
+                              raise ValueError("The arg of `scale` must be positive.")

Contributor

cxxly Apr 20, 2023

为了避免性能问题，建议移除此判断；后续 distribution全面支持参数校验，再进行此判断

cxxly reviewed

View reviewed changes

python/paddle/distribution/cauchy.py Outdated

+                              raise ValueError("The arg of `scale` must be positive.")
+                      super().__init__(
+                          batch_shape=(self.loc + self.scale).shape, event_shape=()

Contributor

cxxly Apr 20, 2023

此处为什么需要加法

Contributor Author

megemini Apr 20, 2023

利用broadcast获取到batch shape，有问题吗？

Contributor Author

megemini Apr 21, 2023

我根据 gumbel.py 把初始化重新写一下吧～：）

Contributor

cxxly Apr 21, 2023

可以用 broadcast_shape，加法会有开销

megemini added 2 commits

April 21, 2023 04:16


          [Change]修改初始化方法与类型检查

a73901f


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

… cauchy_api

Contributor Author

megemini commented Apr 21, 2023

刚看到 PR-CI-Coverage 出错了，不太清楚是什么问题，我在本地的coverage在90%+

Name                          Stmts   Miss  Cover
-------------------------------------------------
cauchy.py                        74      6    92%
test_distribution_cauchy.py     159      2    99%

Name                                 Stmts   Miss  Cover
--------------------------------------------------------
cauchy.py                               74      0   100%
test_distribution_cauchy_static.py     165      0   100%

请帮忙看看，谢谢！：）

Contributor

cxxly commented Apr 24, 2023

刚看到 PR-CI-Coverage 出错了，不太清楚是什么问题，我在本地的coverage在90%+

Name                          Stmts   Miss  Cover
-------------------------------------------------
cauchy.py                        74      6    92%
test_distribution_cauchy.py     159      2    99%

Name                                 Stmts   Miss  Cover
--------------------------------------------------------
cauchy.py                               74      0   100%
test_distribution_cauchy_static.py     165      0   100%

请帮忙看看，谢谢！：）

主要是一些类型检查代码没覆盖到，点击CI能够看到

Contributor Author

megemini commented Apr 25, 2023

主要是一些类型检查代码没覆盖到，点击CI能够看到

这里面 Line data 是 1 的表示覆盖到， 0 表示没覆盖到？

我怎么看里面除了方法名之外都是 0 ... ...

我重新 commit 一下吧～


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

58e0090

… cauchy_api

Contributor Author

megemini commented Apr 25, 2023

@cxxly 刚才看了一下，好象是所有的测试用例目录变了，导致我的测试用例应该是没加进去。

原来是：home/aistudio/Paddle/python/paddle/fluid/tests/unittests/distribution
现在是：home/aistudio/Paddle/test/distribution

我把我的用例移过去重新commit吧～


          [Change]将测试用例移动到新的目录下

871b9f7

luotao1 mentioned this pull request

【Hackathon 4th No.11】为 paddle 添加 Geometric Distribution API #51224

Merged

megemini added 2 commits

April 25, 2023 07:29


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

… cauchy_api


          [Change]适配to_tensor的0D

ae99451

Contributor Author

megemini commented Apr 25, 2023

CI 基本都通过了，就是这个 CheckPRTemplate 不知道为啥失败了～

请评审，谢谢！：）

cxxly approved these changes

View reviewed changes

Contributor

cxxly left a comment

LGTM

luotao1 assigned sunzhongkai588

jeff41404 approved these changes

View reviewed changes

Contributor

jeff41404 left a comment

LGTM

sunzhongkai588 approved these changes

View reviewed changes

Contributor

sunzhongkai588 left a comment

LGTM

luotao1 merged commit 896c931 into PaddlePaddle:develop

2 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment