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.

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

代码退场,清除了与python2相关的一些条件分支 #46696

Merged
merged 12 commits into from
Oct 11, 2022

Conversation

caolonghao
Copy link
Contributor

@caolonghao caolonghao commented Oct 1, 2022

PR types

Others

PR changes

Others

Describe

来源自 Call for contribution - Python 2.7 相关代码退场

代码退场,清除了 rnn layer, unittests, pslib 等代码中一些 python2 相关的条件分支

@paddle-bot
Copy link

paddle-bot bot commented Oct 1, 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 Oct 1, 2022
@paddle-bot
Copy link

paddle-bot bot commented Oct 1, 2022

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

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.

有一些小建议(๑>؂<๑),此外貌似还有两个文件没有修改

if sys.version_info < (3, ):
return

if sys.version_info.major == 2:
check_type(name, "name", (str, type(None), unicode), "ParamAttr")
else:
check_type(name, "name", (str, type(None)), "ParamAttr")

python/paddle/fluid/distributed/ps_pb2.py Outdated Show resolved Hide resolved
python/paddle/fluid/layers/rnn.py Outdated Show resolved Hide resolved
else:
check_type(shapes, 'shapes', integer_types, 'RNNCell')
check_type(shapes, 'shapes', int, 'RNNCell')
Copy link
Member

Choose a reason for hiding this comment

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

这里的 PR-CI-Coverage 覆盖率不过与本 PR 无关,是否可以豁免掉?

image

Copy link
Contributor

Choose a reason for hiding this comment

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

已经豁免

@luotao1 luotao1 merged commit a52ab13 into PaddlePaddle:develop Oct 11, 2022
@caolonghao caolonghao deleted the clear-python2 branch November 26, 2022 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contributor External developers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants