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

在文档中统一静态图模式与动态图模式的英文翻译 #49170

Merged
merged 15 commits into from
Dec 30, 2022
Merged

在文档中统一静态图模式与动态图模式的英文翻译 #49170

merged 15 commits into from
Dec 30, 2022

Conversation

sanbuphy
Copy link
Contributor

@sanbuphy sanbuphy commented Dec 19, 2022 •
edited
Loading

PR types

others

PR changes

others

Describe

others

主要修改了静态图的static mode 的翻译

@paddle-bot
Copy link

paddle-bot bot commented Dec 19, 2022

你的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 contributor External developers status: proposed labels Dec 19, 2022
@paddle-bot
Copy link

paddle-bot bot commented Dec 19, 2022 •
edited
Loading

✅ This PR's description meets the template requirements!
Please wait for other CI results.

Ligoml
Ligoml previously approved these changes Dec 23, 2022
View reviewed changes
Copy link
Contributor

@Ligoml Ligoml left a comment

Choose a reason for hiding this comment

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

LGTM

Ligoml
Ligoml previously approved these changes Dec 23, 2022
View reviewed changes
This was referenced Dec 23, 2022
Closed
Closed
@Ligoml
Copy link
Contributor

Ligoml commented Dec 23, 2022

@sanbuphy codestyle没过，辛苦重新跑一下pre-commit

@sanbuphy
Copy link
Contributor Author

@sanbuphy codestyle没过，辛苦重新跑一下pre-commit

请问pre commit是什么标准的呀~ 我去泡一下

@SigureMo
Copy link
Member

SigureMo commented Dec 24, 2022 •
edited
Loading

请问pre commit是什么标准的呀~ 我去泡一下

详见 PR-CI-Codestyle-Check 流水线，按照说明跑一下就好

2022-12-23 16:36:52 ************************************************************************************
2022-12-23 16:36:52 Your PR code style check failed.
2022-12-23 16:36:52 Please install pre-commit locally and set up git hook scripts:
2022-12-23 16:36:52 
2022-12-23 16:36:52     pip install pre-commit==2.17.0
2022-12-23 16:36:52     pre-commit install
2022-12-23 16:36:52 
2022-12-23 16:36:52 For more information, please refer to our codestyle check guide:
2022-12-23 16:36:52 https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/dev_guides/git_guides/codestyle_check_guide_cn.html
2022-12-23 16:36:52 ************************************************************************************

里面也有文档的链接

UPDATE：才发现超过 100 个文件了，所以 log 没有给出自动修改所有文件的命令……我来整一下吧～

@SigureMo SigureMo self-assigned this Dec 24, 2022
SigureMo
SigureMo previously approved these changes Dec 24, 2022
View reviewed changes
Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

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

LGTM～～～

CodeStyle 给你改好啦，你可以先按照上面的步骤安装配置好 pre-commit，这样下次贡献的时候就不会出现这样的问题啦～

@sanbuphy
Copy link
Contributor Author

LGTM～～～

CodeStyle 给你改好啦，你可以先按照上面的步骤安装配置好 pre-commit，这样下次贡献的时候就不会出现这样的问题啦～

明白，非常感谢~ 圣诞快乐。

@sanbuphy
Copy link
Contributor Author

似乎出现了一些冲突

@SigureMo
Copy link
Member

SigureMo commented Dec 27, 2022 •
edited
Loading

似乎出现了一些冲突

冲突的话要解决的呀

image

网页上可以直接点按钮解决，或者在本地 merge 时解决都可以的

@sanbuphy
Copy link
Contributor Author

似乎出现了一些冲突

冲突的话要解决的呀

image

网页上可以直接点按钮解决，或者在本地 merge 时解决都可以的

好的，我在网页上进行了修改， 都以最新分支为准

SigureMo
SigureMo reviewed Dec 28, 2022
View reviewed changes
python/paddle/fluid/dataloader/dataloader_iter.py Outdated Show resolved Hide resolved
python/paddle/distributed/fleet/utils/hybrid_parallel_inference.py Outdated
@@ -206,7 +206,8 @@ def __init__(
elif core.is_compiled_with_cuda():
self._device = "gpu"
assert self._device, "Only gpu and npu are supported."
assert not _non_static_mode(), "Only static graph mode is supported."

assert not in_dygraph_mode(), "Only static mode is supported."
Copy link
Member

Choose a reason for hiding this comment

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

这里解决冲突后是不是 static graph mode 也恢复了？可以解决完冲突后再修改一下～

fd96ebe (#49170) 里的三个改动里有两个貌似都有这个问题，可以改一下～

Copy link
Contributor Author

Choose a reason for hiding this comment

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

收到，已修改完毕

Copy link
Member

Choose a reason for hiding this comment

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

嗯，可以等 CI 过了疯狂 @Ligoml [doge]，这个 PR 改动挺多的，蛮容易冲突的

我记得之前有几个 CI 有问题，Coverage 覆盖率与本 PR 修改无关应可豁免，Static-Check 和 APPROVAL 等人来 approve 即可，其他的一般 re-run 下就可以了毕竟本 PR 没有修改任何逻辑

Copy link
Contributor Author

Choose a reason for hiding this comment

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

对。。万一别人改了又要重新CI
QWQ 我等跑完了艾特一下

Copy link
Contributor

Choose a reason for hiding this comment

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

嗯，可以等 CI 过了疯狂 @Ligoml [doge]，这个 PR 改动挺多的，蛮容易冲突的

栓Q

@sanbuphy sanbuphy requested a review from Ligoml December 29, 2022 05:46
SigureMo
SigureMo reviewed Dec 29, 2022
View reviewed changes
Copy link
Member

@SigureMo SigureMo left a comment

Choose a reason for hiding this comment

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

这个 PR 最好不要用 test=document_fix 吧，因为改的位置挺多的，不一定全是文档，最好把所有 CI 跑一下吧

paddle/fluid/inference/tensorrt/convert/cast_op.cc Outdated Show resolved Hide resolved
paddle/fluid/inference/tensorrt/convert/equal_op.cc Outdated Show resolved Hide resolved
@sanbuphy sanbuphy requested review from SigureMo and removed request for Ligoml December 29, 2022 09:20
@SigureMo
Copy link
Member

CINN、OP-benchmark、Static-Check 三条流水线可以手动 re-run 下

Ligoml
Ligoml approved these changes Dec 30, 2022
View reviewed changes
Copy link
Contributor

@Ligoml Ligoml left a comment

Choose a reason for hiding this comment

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

LGTM

XiaoguangHu01
XiaoguangHu01 approved these changes Dec 30, 2022
View reviewed changes
Copy link
Contributor

@XiaoguangHu01 XiaoguangHu01 left a comment

Choose a reason for hiding this comment

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

LGTM

@Ligoml
Copy link
Contributor

Ligoml commented Dec 30, 2022

@tianshuo78520a 请帮忙豁免一下PR-CI-Coverage和PR-CI-Static-Check，单测覆盖率和示例代码挂掉都不是这个pr引入的，示例代码属于fluid目录，近期应该会有相关同学清理

@Ligoml Ligoml merged commit a186e60 into PaddlePaddle:develop Dec 30, 2022
@sanbuphy sanbuphy deleted the docsbranch branch December 30, 2022 03:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XiaoguangHu01 XiaoguangHu01 XiaoguangHu01 approved these changes

@Ligoml Ligoml Ligoml approved these changes

@zhiqiu zhiqiu zhiqiu approved these changes

@SigureMo SigureMo Awaiting requested review from SigureMo

Assignees

@SigureMo SigureMo

@Ligoml Ligoml

Labels
contributor External developers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sanbuphy @Ligoml @SigureMo @zhiqiu @XiaoguangHu01