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

Cache scope in While Op during Inference. #49083

Closed
wants to merge 3 commits into from
Closed

Cache scope in While Op during Inference. #49083

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da4cb8e
Cache scope in While Op during Inference.
carryyu Dec 15, 2022
2664ac2
modify init of inference_cache_scope_
carryyu Dec 16, 2022
bfdd839
fix conflicts
carryyu Dec 16, 2022
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
25 changes: 17 additions & 8 deletions paddle/fluid/operators/controlflow/while_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,18 +271,27 @@ class WhileOp : public framework::OperatorBase {
scope.FindVar(Input(kCondition))->Get<phi::DenseTensor>());
}
} else {
auto &current_scope = scope.NewScope();
bool need_create_variable = false;
if (inference_cache_scope_ == nullptr) {
inference_cache_scope_ = &scope.NewScope();
need_create_variable = true;
VLOG(4) << "Inference cache scope in While Op: "
<< inference_cache_scope_;
}

if (FLAGS_control_flow_use_new_executor) {
BuildScopeForControlFlowOp(*core_, *block, &current_scope);
core_->reset_scope(&current_scope);
BuildScopeForControlFlowOp(*core_, *block, inference_cache_scope_);
core_->reset_scope(inference_cache_scope_);
} else {
executor_->CreateVariables(*program, &current_scope, block->ID());
if (need_create_variable) {
executor_->CreateVariables(
*program, inference_cache_scope_, block->ID());
}
}

while (cond_data) {
for (auto &name : current_scope.LocalVarNames()) {
auto *var = current_scope.Var(name);
for (auto &name : inference_cache_scope_->LocalVarNames()) {
auto *var = inference_cache_scope_->Var(name);
if (var->IsType<phi::DenseTensor>()) {
// Clear all lod information for all lod_tensors.
auto *t = var->GetMutable<phi::DenseTensor>();
Expand All @@ -299,20 +308,20 @@ class WhileOp : public framework::OperatorBase {
core_->Run({}, false);
} else {
executor_->RunPreparedContext(
ctx_.get(), &current_scope, false, false, false);
ctx_.get(), inference_cache_scope_, false, false, false);
}

cond_data = GetCondData(
scope.FindVar(Input(kCondition))->Get<phi::DenseTensor>());
}
scope.DeleteScope(&current_scope);
}
}

private:
mutable std::shared_ptr<framework::Executor> executor_{nullptr};
mutable std::unique_ptr<framework::ExecutorPrepareContext> ctx_{nullptr};
mutable std::shared_ptr<framework::InterpreterCore> core_{nullptr};
mutable framework::Scope *inference_cache_scope_{nullptr};
carryyu marked this conversation as resolved.
Show resolved Hide resolved
};

class WhileOpMaker : public framework::OpProtoAndCheckerMaker {
Expand Down