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

Add the call of DropKids at the end of executor.Run to delete the local scopes created in operators #10403

Merged
merged 3 commits into from
May 7, 2018
Merged

Add the call of DropKids at the end of executor.Run to delete the local scopes created in operators #10403

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5afc973
Add the call of DeleteScope to delete the memory of scope created by …
Xreki May 4, 2018
5906a94
Call DropKids at the end of executor.Run to delete all local scopes c…
Xreki May 4, 2018
51cd6cd
Merge branch 'develop' into core_fix_delete_scope
Xreki May 4, 2018
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
4 changes: 4 additions & 0 deletions paddle/fluid/framework/executor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,12 @@ void Executor::RunPreparedContext(ExecutorPrepareContext* ctx, Scope* scope,
}
}
}
platform::DeviceContextPool::Instance().Get(place_)->Wait();
if (create_vars && create_local_scope) {
scope->DeleteScope(local_scope);
} else {
// Delete the local scopes created in operators.
scope->DropKids();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if create_vars is False and create_local_scope is True, do we need to use

local_scope->DropKids()

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The local_scope itself is deleted by scope->DeleteScope(local_scope);, all the kids will be deleted, see the implementation of the destructor:

Paddle/paddle/fluid/framework/scope.cc

Lines 37 to 43 in 0285a2b

Scope::~Scope() {
DropKids();
for (auto& kv : vars_) {
VLOG(3) << "Destroy variable " << kv.first;
delete kv.second;
}
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @Xreki , maybe we can't delete the kids in the execute function, some conditions like dist training, pserver will execute the optimize blocks on the same scope instead of a new scope for each optimizes action.

related issued #10625

}
if (FLAGS_benchmark) {
VLOG(2) << "-------------------------------------------------------";
Expand Down