Skip to content

[CodeStyle][py2] fix a decode error caused by 47036 - #47097

Merged
luotao1 merged 4 commits into
PaddlePaddle:developfrom
cattidea:py2/fix/compat-to-text-error
Oct 19, 2022
Merged

luotao1 merged 4 commits into
PaddlePaddle:developfrom
cattidea:py2/fix/compat-to-text-error

Conversation

@SigureMo

Copy link
Copy Markdown
Collaborator

PR types

Others

PR changes

Others

Describe

详见 #47096,由 #47036 导致,由于主框架内使用方式仅为传递 bytes,未考虑到外部使用了传递 str 的方式,现做出兼容两者的处理,与原有代码行为保持一致

fixes #47096

@paddle-bot

paddle-bot Bot commented Oct 18, 2022

Copy link
Copy Markdown

你的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 18, 2022
@luotao1 luotao1 self-assigned this Oct 18, 2022
@SigureMo SigureMo changed the title [CodeStyle][py2] fix an decode error caused by 47036 [CodeStyle][py2] fix a decode error caused by 47036 Oct 18, 2022
luotao1
luotao1 previously approved these changes Oct 18, 2022

@luotao1 luotao1 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM

@luotao1

luotao1 commented Oct 18, 2022

Copy link
Copy Markdown
Collaborator

可以考虑加个单测来通过覆盖率测试

@SigureMo

Copy link
Copy Markdown
Collaborator Author

可以考虑加个单测来通过覆盖率测试

已添加,由于没有找到相关 Block 单测,因此单独建了一个单测文件用于测试 Block._rename_var

@luotao1 luotao1 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

LGTM

@luotao1
luotao1 merged commit ddf317e into PaddlePaddle:develop Oct 19, 2022
@SigureMo
SigureMo deleted the py2/fix/compat-to-text-error branch October 19, 2022 04:32
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.

因PR:https://github.com/PaddlePaddle/Paddle/pull/47036 导致PaddleSlim单测test_merge.py failed

2 participants