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

[BugFix][ConditionalBlock] fix judgement about scope validation #50086

Merged
merged 8 commits into from
Feb 9, 2023
Merged

[BugFix][ConditionalBlock] fix judgement about scope validation #50086

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
892410f
fix judgement about scope validation
kangguangli Jan 30, 2023
6742963
Merge branch 'fix_conditional_block_op' of github.com:kangguangli/Pad…
kangguangli Feb 2, 2023
801509c
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
kangguangli Feb 6, 2023
a9011a8
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
kangguangli Feb 6, 2023
d834901
Merge branch 'develop' into fix_conditional_block_op
kangguangli Feb 7, 2023
af6b9c6
fix ci bug: same address is not enough for data consistency
kangguangli Feb 8, 2023
f223a52
remove useless check
kangguangli Feb 8, 2023
9096d72
remove useless check
kangguangli Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions paddle/fluid/operators/controlflow/conditional_block_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,8 @@ class ConditionalBlockOp : public ConditionalOp {
"got a null Scope variable. Please set the Scope variable."));

auto *scopes = scope_var->GetMutable<std::vector<framework::Scope *>>();

if (scopes->size() == 0 || !FLAGS_control_flow_use_new_executor) {
scopes->resize(1);
scopes->front() = &scope.NewScope();
}

// We need to know whether the scope we cached is still valid.
// If not, we need to create a new one.
if (scope.kids().size() == 0) {
scopes->front() = &scope.NewScope();
}
scopes->resize(1);
scopes->front() = &scope.NewScope();

auto &cur_scope = *scopes->front();
#ifdef PADDLE_WITH_MKLDNN
Expand Down