Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
b20a21e2
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
b20a21e2
编写于
2月 19, 2019
作者:
L
liuwei1031
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix comments of PR 15529, test=develop
上级
56a5039e
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
8 addition
and
8 deletion
+8
-8
paddle/fluid/memory/allocation/legacy_allocator.cc
paddle/fluid/memory/allocation/legacy_allocator.cc
+3
-3
paddle/fluid/memory/allocation/legacy_allocator.h
paddle/fluid/memory/allocation/legacy_allocator.h
+5
-5
未找到文件。
paddle/fluid/memory/allocation/legacy_allocator.cc
浏览文件 @
b20a21e2
...
@@ -356,7 +356,7 @@ void MemInfo::Minus(const size_t &size) {
...
@@ -356,7 +356,7 @@ void MemInfo::Minus(const size_t &size) {
usage_
-=
size
;
usage_
-=
size
;
}
}
uint64_t
MemInfo
::
GetPeakUsage
()
{
return
peak_usage_
;
}
uint64_t
MemInfo
::
GetPeakUsage
()
const
{
return
peak_usage_
;
}
LegacyMemMonitor
::~
LegacyMemMonitor
()
{
LegacyMemMonitor
::~
LegacyMemMonitor
()
{
for
(
auto
&
item
:
gpu_mem_info_
)
delete
item
.
second
;
for
(
auto
&
item
:
gpu_mem_info_
)
delete
item
.
second
;
...
@@ -380,10 +380,10 @@ void LegacyMemMonitor::Minus(const int &device, const size_t &size) {
...
@@ -380,10 +380,10 @@ void LegacyMemMonitor::Minus(const int &device, const size_t &size) {
gpu_mem_info_
[
device
]
->
Minus
(
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
()
return
gpu_mem_info_
.
find
(
device
)
==
gpu_mem_info_
.
end
()
?
0
?
0
:
gpu_mem_info_
[
device
]
->
GetPeakUsage
();
:
gpu_mem_info_
.
find
(
device
)
->
second
->
GetPeakUsage
();
}
}
void
LegacyMemMonitor
::
PrintMemUsage
()
{
void
LegacyMemMonitor
::
PrintMemUsage
()
{
...
...
paddle/fluid/memory/allocation/legacy_allocator.h
浏览文件 @
b20a21e2
...
@@ -27,20 +27,20 @@ namespace allocation {
...
@@ -27,20 +27,20 @@ namespace allocation {
class
MemInfo
{
class
MemInfo
{
public:
public:
MemInfo
()
:
usage_
(
0
),
peak_usage_
(
0
)
{}
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
// return a flag to indicate current operation will create a peak point or not
bool
Add
(
const
size_t
&
);
bool
Add
(
const
size_t
&
);
void
Minus
(
const
size_t
&
);
void
Minus
(
const
size_t
&
);
uint64_t
GetPeakUsage
();
uint64_t
GetPeakUsage
()
const
;
private:
private:
/* current memory usage*/
/* current memory usage*/
uint64_t
usage_
;
uint64_t
usage_
;
uint64_t
peak_usage_
;
uint64_t
peak_usage_
;
std
::
mutex
mutex_
;
std
::
mutex
mutex_
;
DISABLE_COPY_AND_ASSIGN
(
MemInfo
);
};
};
class
LegacyMemMonitor
{
class
LegacyMemMonitor
{
...
@@ -56,11 +56,11 @@ class LegacyMemMonitor {
...
@@ -56,11 +56,11 @@ class LegacyMemMonitor {
void
Add
(
const
int
&
,
const
size_t
&
);
void
Add
(
const
int
&
,
const
size_t
&
);
void
Minus
(
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
();
void
PrintMemUsage
();
pr
otected
:
pr
ivate
:
MemUsage
gpu_mem_info_
;
MemUsage
gpu_mem_info_
;
};
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录