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

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

Merged
merged 1 commit into from
Sep 13, 2022

Conversation

From00
Copy link
Contributor

@From00 From00 commented Sep 9, 2022

PR types

Bug fixes

PR changes

Others

Describe

Cherry-pick #45898

Some input vars of create_py_reader OP is created in Scope while not existed in program. Standalone executor has hot fixed for auto-generated variable names like lod_tensor_blocking_queue_xxx (see interpretercore_util.cc), however, manual-generated py_reader name is not allowed. This PR supports this case.

PaddlePaddle#45898)

* Allow manaully set py_reader name in standalone executor

* Fix CI errors
@paddle-bot
Copy link

paddle-bot bot commented Sep 9, 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.

@phlrain phlrain merged commit 29c44eb into PaddlePaddle:release/2.4 Sep 13, 2022
Aurelius84 pushed a commit that referenced this pull request Sep 19, 2022
… 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
feifei-111 added a commit to feifei-111/Paddle that referenced this pull request Sep 23, 2022
… 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
2742195759 pushed a commit to 2742195759/Paddle that referenced this pull request Nov 2, 2022
… 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
XiaoguangHu01 pushed a commit that referenced this pull request Nov 4, 2022
* [ 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>
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>
@From00 From00 deleted the cherry-pick-45898 branch April 5, 2023 09:06
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