Skip to content
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

[Docathon][Fix System Message No.3、9、14、15] #58664

Merged
merged 6 commits into from
Nov 30, 2023
Merged

[Docathon][Fix System Message No.3、9、14、15] #58664

merged 6 commits into from
Nov 30, 2023

Conversation

BernieHuang2008
Copy link
Contributor

@BernieHuang2008 BernieHuang2008 commented Nov 3, 2023 •
edited
Loading

PR types

Bug fixes

PR changes

Docs

Description

Docathon 英文文档格式修复#58237, 任务3、9、14、15

@paddle-bot Paddle-bot
Copy link

paddle-bot bot commented Nov 3, 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 paddle-bot bot added the contributor External developers label Nov 3, 2023
@BernieHuang2008 BernieHuang2008 changed the title [Docathon][Fix System Message No.3、9-17] [Docathon][Fix System Message No.3、9-11、25] Nov 3, 2023
@BernieHuang2008 BernieHuang2008 changed the title [Docathon][Fix System Message No.3、9-11、25] [Docathon][Fix System Message No.3、9-11、14-15、25] Nov 3, 2023
@BernieHuang2008 BernieHuang2008 marked this pull request as ready for review November 4, 2023 11:59
@luotao1 luotao1 mentioned this pull request Nov 6, 2023
Closed
@luotao1 luotao1 added the HappyOpenSource 快乐开源活动issue与PR label Nov 6, 2023
sunzhongkai588
sunzhongkai588 reviewed Nov 6, 2023
View reviewed changes
python/paddle/distributed/fleet/data_generator/data_generator.py Outdated
@@ -156,13 +156,13 @@ def generate_sample(self, line):

Returns:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

    Returns:
        Returns the data processed by the user.
        The data format is list or tuple:[(name, [feasign, ...]), ...]
        or ((name, [feasign, ...]), ...)

python/paddle/distributed/fleet/data_generator/data_generator.py Outdated
or ((name, [feasign, ...]), ...)
The data format is list or tuple:
[(name, [feasign, ...]), ...]
or ((name, [feasign, ...]), ...)

For example:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

        For example: 
        [("words", [1926, 08, 17]), ("label", [1])]
        or (("words", [1926, 08, 17]), ("label", [1]))

python/paddle/distributed/fleet/data_generator/data_generator.py Outdated
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
还是有点问题，同一段落都统一缩进叭

python/paddle/nn/layer/loss.py Show resolved Hide resolved
python/paddle/nn/layer/loss.py Show resolved Hide resolved
@BernieHuang2008 BernieHuang2008 force-pushed the docathon branch 2 times, most recently from d9dc843 to 96cd216 Compare November 8, 2023 12:37
@BernieHuang2008
Copy link
Contributor Author

@sunzhongkai588 孙老师帮我看看？

sunzhongkai588
sunzhongkai588 previously approved these changes Nov 12, 2023
View reviewed changes
Copy link
Contributor

@sunzhongkai588 sunzhongkai588 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM~很棒

@luotao1
Copy link
Contributor

luotao1 commented Nov 13, 2023

需要通过Codestyle-Check流水线

@BernieHuang2008
Copy link
Contributor Author

BernieHuang2008 commented Nov 13, 2023 •
edited
Loading

需要通过Codestyle-Check流水线

老师那个报错我看不懂。。。

https://xly.bce.baidu.com/paddlepaddle/paddle/newipipe/detail/9486008/job/24370971

@ooooo-create
Copy link
Contributor

需要通过Codestyle-Check流水线

老师那个报错我看不懂。。。

https://xly.bce.baidu.com/paddlepaddle/paddle/newipipe/detail/9486008/job/24370971
按照下面的操作修复就可以～
image
先在本地安装 pre-commit pip install pre-commit==2.17.0
建议使用 pre-commit install 把 pre-commit 添加到 git hook 脚本，这样以后每次 commit 的时候就会自动运 pre-commit.
在本地运行 pre-commit run --files python/paddle/amp/debugging.py python/paddle/framework/random.py python/paddle/hapi/model.py python/paddle/nn/layer/loss.py 直到没有问题，再重新提交 commit 一下～

@BernieHuang2008
Copy link
Contributor Author

谢谢o老师 :-) ，我找个时间改一下

@paddle-ci-bot Paddle-ci-bot
Copy link

paddle-ci-bot bot commented Nov 16, 2023

Sorry to inform you that 96cd216's CIs have passed for more than 7 days. To prevent PR conflicts, you need to re-run all CIs manually.

@luotao1
Copy link
Contributor

luotao1 commented Nov 23, 2023

子任务25已经在下面PR中合入了，本PR可以将对应的修改去掉：

@BernieHuang2008
Copy link
Contributor Author

@luotao1 @sunzhongkai588
老师们，code-style已经过了，可以合并了吗？:|

@BernieHuang2008 BernieHuang2008 changed the title [Docathon][Fix System Message No.3、9-11、14-15、25] [Docathon][Fix System Message No.3、9、14、15] Nov 26, 2023
@ooooo-create
Copy link
Contributor

image
看 ci 设置为25还是超时，改成 40或者50试试叭

@sunzhongkai588
Copy link
Contributor

image 看 ci 设置为25还是超时，改成 40或者50试试叭

我自己测试了下，花了69秒。以防万一设置成 TIMEOUT(80) 吧。 @BernieHuang2008 （明明之前没加 timeout 也能过示例代码检测，好奇怪 #55953 ）

@luotao1 luotao1 merged commit 6e5aad0 into PaddlePaddle:develop Nov 30, 2023
@BernieHuang2008 BernieHuang2008 deleted the docathon branch November 30, 2023 04:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ooooo-create ooooo-create ooooo-create left review comments

@luotao1 luotao1 luotao1 approved these changes

@sunzhongkai588 sunzhongkai588 sunzhongkai588 left review comments

Assignees

@luotao1 luotao1

@sunzhongkai588 sunzhongkai588

Labels
contributor External developers HappyOpenSource 快乐开源活动issue与PR
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@BernieHuang2008 @luotao1 @ooooo-create @sunzhongkai588