Skip to content

fix comments of PR 15529, test=develop #15786

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
dzhwinter merged 2 commits into from
Feb 21, 2019
Merged

fix comments of PR 15529, test=develop #15786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b20a21e
fix comments of PR 15529, test=develop
Feb 19, 2019
4c7b6e2
fix comment, test=develop
Feb 19, 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 paddle/fluid/memory/allocation/legacy_allocator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ void MemInfo::Minus(const size_t &size) {
usage_ -= size;
}

uint64_t MemInfo::GetPeakUsage() { return peak_usage_; }
uint64_t MemInfo::GetPeakUsage() const { return peak_usage_; }

LegacyMemMonitor::~LegacyMemMonitor() {
for (auto &item : gpu_mem_info_) delete item.second;
Expand All @@ -380,10 +380,10 @@ void LegacyMemMonitor::Minus(const int &device, const size_t &size) {
gpu_mem_info_[device]->Minus(size);
}

uint64_t LegacyMemMonitor::GetMemUsage(const int &device) {
uint64_t LegacyMemMonitor::GetMemUsage(const int &device) const {
return gpu_mem_info_.find(device) == gpu_mem_info_.end()
? 0
: gpu_mem_info_[device]->GetPeakUsage();
: gpu_mem_info_.find(device)->second->GetPeakUsage();
Copy link
Contributor

@dzhwinter dzhwinter Feb 19, 2019

Choose a reason for hiding this comment

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

at(device)

Copy link
Contributor Author

@liupluswei liupluswei Feb 19, 2019

Choose a reason for hiding this comment

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

updated

}

void LegacyMemMonitor::PrintMemUsage() {
Expand Down
10 changes: 5 additions & 5 deletions paddle/fluid/memory/allocation/legacy_allocator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,20 @@ namespace allocation {
class MemInfo {
public:
MemInfo() : usage_(0), peak_usage_(0) {}
MemInfo(const MemInfo &) = delete;
MemInfo &operator=(const MemInfo &) = delete;

// return a flag to indicate current operation will create a peak point or not
bool Add(const size_t &);
void Minus(const size_t &);

uint64_t GetPeakUsage();
uint64_t GetPeakUsage() const;

private:
/* current memory usage*/
uint64_t usage_;
uint64_t peak_usage_;
std::mutex mutex_;

DISABLE_COPY_AND_ASSIGN(MemInfo);
};

class LegacyMemMonitor {
Expand All @@ -56,11 +56,11 @@ class LegacyMemMonitor {
void Add(const int &, const size_t &);
void Minus(const int &, const size_t &);

uint64_t GetMemUsage(const int &);
uint64_t GetMemUsage(const int &) const;

void PrintMemUsage();

protected:
private:
MemUsage gpu_mem_info_;
};

Expand Down