Skip to content

Fixed the memory leak #209

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

Merged
merged 3 commits into from
Aug 17, 2019
Merged

Fixed the memory leak #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0d2df3
Fixed the memory leak
avijit-nervana Aug 16, 2019
810c23f
format fix
avijit-nervana Aug 16, 2019
a31674d
Merge branch 'master' into avijit/KW-fix
avijit-nervana Aug 16, 2019
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
6 changes: 3 additions & 3 deletions ngraph_bridge/ngraph_backend_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ BackendManager::~BackendManager() {
// initialize backend manager
string BackendManager::ng_backend_name_ = "CPU";
mutex BackendManager::ng_backend_name_mutex_;
map<string, Backend*> BackendManager::ng_backend_map_;
map<string, std::unique_ptr<Backend>> BackendManager::ng_backend_map_;
mutex BackendManager::ng_backend_map_mutex_;
map<std::string, int> BackendManager::ref_count_each_backend_;

Expand All @@ -49,7 +49,6 @@ Status BackendManager::CreateBackend(const string& backend_name) {
auto itr = BackendManager::ng_backend_map_.find(backend_name);
// if backend does not exist create it
if (itr == BackendManager::ng_backend_map_.end()) {
Backend* bend = new Backend;
std::shared_ptr<ng::runtime::Backend> bend_ptr;
try {
bend_ptr = ng::runtime::Backend::create(backend_name);
Expand All @@ -62,8 +61,9 @@ Status BackendManager::CreateBackend(const string& backend_name) {
return errors::Internal("Could not create backend of type ",
backend_name);
}
std::unique_ptr<Backend> bend = std::unique_ptr<Backend>(new Backend);
bend->backend_ptr = std::move(bend_ptr);
BackendManager::ng_backend_map_[backend_name] = bend;
BackendManager::ng_backend_map_[backend_name] = std::move(bend);
BackendManager::ref_count_each_backend_[backend_name] = 0;
}
BackendManager::ref_count_each_backend_[backend_name]++;
Expand Down
2 changes: 1 addition & 1 deletion ngraph_bridge/ngraph_backend_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class BackendManager {
static mutex ng_backend_name_mutex_;

// map of cached backend objects
static map<string, Backend*> ng_backend_map_;
static map<string, std::unique_ptr<Backend>> ng_backend_map_;
static mutex ng_backend_map_mutex_;

// Map of backends and their reference counts
Expand Down