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

[CherryPick] Cherry pick #45916 #46031 #47299 #47610

Merged

Conversation

2742195759
Copy link
Contributor

PR types

Bug fixes

PR changes

Others

Describe

Cherry pick #45916 #46031 #47299

2742195759 and others added 3 commits November 2, 2022 12:39
…undefined-var (PaddlePaddle#45916)

* fix select_input with different shape errors:
1. select_input_with_buildin_type directly return non-undefinedvar branch when meeting undefined var
2. the output shape of select_input is inferred from inputs.

* reverse the logic in select_input
… variable and another returns None (PaddlePaddle#46031)

* [cherry-pick] Allow manaully set py_reader name in standalone executor (PaddlePaddle#45898) (PaddlePaddle#45931)

* Allow manaully set py_reader name in standalone executor
* fix bugs while cond receives dict as input

* add unittest

* change flatten -> _is_sequence_except_dict
@paddle-bot
Copy link

paddle-bot bot commented Nov 2, 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.

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

@XiaoguangHu01 XiaoguangHu01 merged commit 72e1eb6 into PaddlePaddle:release/2.4 Nov 4, 2022
pangyoki pushed a commit to pangyoki/Paddle that referenced this pull request Nov 4, 2022
…Paddle#47299  (PaddlePaddle#47610)

* [ Dy2Static ] Fix bugs when select inputs meeting different shape or undefined-var (PaddlePaddle#45916)

* fix select_input with different shape errors:
1. select_input_with_buildin_type directly return non-undefinedvar branch when meeting undefined var
2. the output shape of select_input is inferred from inputs.

* reverse the logic in select_input

* [warning] added warning message in cond block when one branch returns variable and another returns None (PaddlePaddle#46031)

* [cherry-pick] Allow manaully set py_reader name in standalone executor (PaddlePaddle#45898) (PaddlePaddle#45931)

* Allow manaully set py_reader name in standalone executor

* [BugFix] while cond receives dict as input (PaddlePaddle#47299)

* fix bugs while cond receives dict as input

* add unittest

* change flatten -> _is_sequence_except_dict

* code format

Co-authored-by: feifei-111 <wuzhanfei@baidu.com>
jzhang533 pushed a commit that referenced this pull request Nov 7, 2022
…ompatible with installed cudnn version (#47673)

* Cherry-pick PR47666, add cudnn error (#47666)

* [CherryPick] Cherry pick #45916 #46031 #47299  (#47610)

* [ Dy2Static ] Fix bugs when select inputs meeting different shape or undefined-var (#45916)

* fix select_input with different shape errors:
1. select_input_with_buildin_type directly return non-undefinedvar branch when meeting undefined var
2. the output shape of select_input is inferred from inputs.

* reverse the logic in select_input

* [warning] added warning message in cond block when one branch returns variable and another returns None (#46031)

* [cherry-pick] Allow manaully set py_reader name in standalone executor (#45898) (#45931)

* Allow manaully set py_reader name in standalone executor

* [BugFix] while cond receives dict as input (#47299)

* fix bugs while cond receives dict as input

* add unittest

* change flatten -> _is_sequence_except_dict

* code format

Co-authored-by: feifei-111 <wuzhanfei@baidu.com>

Co-authored-by: xiongkun <xiongkun03@baidu.com>
Co-authored-by: feifei-111 <wuzhanfei@baidu.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants