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

cache scope in while #52628

Merged
merged 3 commits into from
Apr 12, 2023
Merged

cache scope in while #52628

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ace62b5
while reset_scope
zhupengyang Apr 7, 2023
a09611c
Merge branch 'develop' into new_executor_2
zhupengyang Apr 11, 2023
9ff85b6
test
zhupengyang Apr 11, 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
33 changes: 26 additions & 7 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 @@ -22,6 +22,13 @@
#ifdef PADDLE_WITH_MKLDNN
#include "paddle/fluid/platform/mkldnn_helper.h"
#endif

PADDLE_DEFINE_EXPORTED_bool(
cache_inference_while_scope,
false,
"Cache the scope of the while op to avoid repeated creation of the scope "
"for each iteration and improve inference performance.");

namespace paddle {
namespace framework {
class InferShapeContext;
Expand Down Expand Up @@ -257,14 +264,23 @@ class WhileOp : public framework::OperatorBase {
scope.FindVar(Input(kCondition))->Get<phi::DenseTensor>());
}
} else {
auto &current_scope = scope.NewScope();

BuildScopeForControlFlowOp(*core_, *block, &current_scope);
core_->reset_scope(&current_scope);
framework::Scope *current_scope = nullptr;
if (!FLAGS_cache_inference_while_scope) {
current_scope = &(scope.NewScope());
BuildScopeForControlFlowOp(*core_, *block, current_scope);
core_->reset_scope(current_scope);
} else {
if (cached_inference_scope_ == nullptr) {
cached_inference_scope_ = &(scope.NewScope());
BuildScopeForControlFlowOp(*core_, *block, cached_inference_scope_);
core_->reset_scope(cached_inference_scope_);
}
current_scope = cached_inference_scope_;
}

while (cond_data) {
for (auto &name : current_scope.LocalVarNames()) {
auto *var = current_scope.Var(name);
for (auto &name : current_scope->LocalVarNames()) {
auto *var = current_scope->Var(name);
if (var->IsType<phi::DenseTensor>()) {
// Clear all lod information for all lod_tensors.
auto *t = var->GetMutable<phi::DenseTensor>();
Expand All @@ -283,14 +299,17 @@ class WhileOp : public framework::OperatorBase {
scope.FindVar(Input(kCondition))->Get<phi::DenseTensor>());
}

scope.DeleteScope(&current_scope);
if (!FLAGS_cache_inference_while_scope) {
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 *cached_inference_scope_{nullptr};
};

class WhileOpMaker : public framework::OpProtoAndCheckerMaker {
Expand Down