Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
7a4f3be9
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看板
提交
7a4f3be9
编写于
1月 06, 2018
作者:
Y
Yibing Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix profiler place bug
上级
df3b250c
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
6 addition
and
8 deletion
+6
-8
paddle/platform/profiler.cc
paddle/platform/profiler.cc
+6
-8
未找到文件。
paddle/platform/profiler.cc
浏览文件 @
7a4f3be9
...
@@ -181,6 +181,7 @@ std::vector<std::vector<Event>> DisableProfiler() {
...
@@ -181,6 +181,7 @@ std::vector<std::vector<Event>> DisableProfiler() {
void
ParseEvents
(
std
::
vector
<
std
::
vector
<
Event
>>&
events
,
void
ParseEvents
(
std
::
vector
<
std
::
vector
<
Event
>>&
events
,
EventSortingKey
sorted_by
)
{
EventSortingKey
sorted_by
)
{
if
(
g_profiler_place
==
""
)
return
;
std
::
vector
<
std
::
vector
<
EventItem
>>
events_table
;
std
::
vector
<
std
::
vector
<
EventItem
>>
events_table
;
size_t
max_name_width
=
0
;
size_t
max_name_width
=
0
;
for
(
size_t
i
=
0
;
i
<
events
.
size
();
i
++
)
{
for
(
size_t
i
=
0
;
i
<
events
.
size
();
i
++
)
{
...
@@ -199,7 +200,7 @@ void ParseEvents(std::vector<std::vector<Event>>& events,
...
@@ -199,7 +200,7 @@ void ParseEvents(std::vector<std::vector<Event>>& events,
}
}
if
(
rit
!=
pushed_events
.
rend
())
{
if
(
rit
!=
pushed_events
.
rend
())
{
double
event_time
=
(
g_
state
==
ProfilerState
::
kCUDA
)
double
event_time
=
(
g_
profiler_place
==
"CUDA"
)
?
rit
->
CudaElapsedMs
(
events
[
i
][
j
])
?
rit
->
CudaElapsedMs
(
events
[
i
][
j
])
:
rit
->
CpuElapsedMs
(
events
[
i
][
j
]);
:
rit
->
CpuElapsedMs
(
events
[
i
][
j
]);
std
::
string
event_name
=
std
::
string
event_name
=
...
@@ -224,7 +225,7 @@ void ParseEvents(std::vector<std::vector<Event>>& events,
...
@@ -224,7 +225,7 @@ void ParseEvents(std::vector<std::vector<Event>>& events,
std
::
max
(
event_time
,
event_items
[
index
].
max_time
);
std
::
max
(
event_time
,
event_items
[
index
].
max_time
);
}
}
// remove the
start
marker from the list
// remove the
push
marker from the list
pushed_events
.
erase
((
++
rit
).
base
());
pushed_events
.
erase
((
++
rit
).
base
());
}
else
{
}
else
{
LOG
(
WARNING
)
<<
"Cannot find the push marker of event
\'
"
LOG
(
WARNING
)
<<
"Cannot find the push marker of event
\'
"
...
@@ -257,13 +258,11 @@ void ParseEvents(std::vector<std::vector<Event>>& events,
...
@@ -257,13 +258,11 @@ void ParseEvents(std::vector<std::vector<Event>>& events,
}
}
events_table
.
push_back
(
event_items
);
events_table
.
push_back
(
event_items
);
//
To check whether
there are events with `push` but without `pop`
//
log warning if
there are events with `push` but without `pop`
std
::
list
<
Event
>::
reverse_iterator
rit
=
pushed_events
.
rbegin
();
std
::
list
<
Event
>::
reverse_iterator
rit
=
pushed_events
.
rbegin
();
while
(
rit
!=
pushed_events
.
rend
())
{
while
(
rit
!=
pushed_events
.
rend
())
{
if
(
rit
->
kind
()
==
"push"
)
{
LOG
(
WARNING
)
<<
"Cannot find the pop marker of event
\'
"
<<
rit
->
name
()
LOG
(
WARNING
)
<<
"Cannot find the pop marker of event
\'
"
<<
rit
->
name
()
<<
"
\'
, which will be ignored in profiling report."
;
<<
"
\'
, which will be ignored in profiling report."
;
}
++
rit
;
++
rit
;
}
}
}
}
...
@@ -275,7 +274,6 @@ void ParseEvents(std::vector<std::vector<Event>>& events,
...
@@ -275,7 +274,6 @@ void ParseEvents(std::vector<std::vector<Event>>& events,
void
PrintProfilingReport
(
std
::
vector
<
std
::
vector
<
EventItem
>>&
events_table
,
void
PrintProfilingReport
(
std
::
vector
<
std
::
vector
<
EventItem
>>&
events_table
,
EventSortingKey
sorted_by
,
const
size_t
name_width
,
EventSortingKey
sorted_by
,
const
size_t
name_width
,
const
size_t
data_width
)
{
const
size_t
data_width
)
{
if
(
g_profiler_place
==
""
)
return
;
// Output header information
// Output header information
std
::
cout
<<
"
\n
------------------------->"
std
::
cout
<<
"
\n
------------------------->"
<<
" Profiling Report "
<<
" Profiling Report "
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录