Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
cff6841a
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 2 年 前同步成功
通知
708
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看板
未验证
提交
cff6841a
编写于
3月 14, 2022
作者:
W
wangguanzhong
提交者:
GitHub
3月 14, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refine pipeline visualize (#5347)
* refine pipeline visualize * add fps vis * refine vis when box is empty
上级
8ffa45af
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
141 addition
and
69 deletion
+141
-69
deploy/pphuman/config/infer_cfg.yml
deploy/pphuman/config/infer_cfg.yml
+1
-1
deploy/pphuman/pipe_utils.py
deploy/pphuman/pipe_utils.py
+10
-6
deploy/pphuman/pipeline.py
deploy/pphuman/pipeline.py
+33
-10
deploy/python/attr_infer.py
deploy/python/attr_infer.py
+73
-39
deploy/python/visualize.py
deploy/python/visualize.py
+24
-13
未找到文件。
deploy/pphuman/config/infer_cfg.yml
浏览文件 @
cff6841a
...
@@ -3,7 +3,7 @@ attr_thresh: 0.5
...
@@ -3,7 +3,7 @@ attr_thresh: 0.5
visual
:
True
visual
:
True
DET
:
DET
:
model_dir
:
output_inference/
pedestrian_yolov3_darknet
/
model_dir
:
output_inference/
mot_ppyolov3/
/
batch_size
:
1
batch_size
:
1
ATTR
:
ATTR
:
...
...
deploy/pphuman/pipe_utils.py
浏览文件 @
cff6841a
...
@@ -134,9 +134,17 @@ class PipeTimer(Times):
...
@@ -134,9 +134,17 @@ class PipeTimer(Times):
}
}
self
.
img_num
=
0
self
.
img_num
=
0
def
info
(
self
,
average
=
False
):
def
get_total_time
(
self
):
total_time
=
self
.
total_time
.
value
()
total_time
=
self
.
total_time
.
value
()
total_time
=
round
(
total_time
,
4
)
total_time
=
round
(
total_time
,
4
)
average_latency
=
total_time
/
max
(
1
,
self
.
img_num
)
qps
=
0
if
total_time
>
0
:
qps
=
1
/
average_latency
return
total_time
,
average_latency
,
qps
def
info
(
self
):
total_time
,
average_latency
,
qps
=
self
.
get_total_time
()
print
(
"------------------ Inference Time Info ----------------------"
)
print
(
"------------------ Inference Time Info ----------------------"
)
print
(
"total_time(ms): {}, img_num: {}"
.
format
(
total_time
*
1000
,
print
(
"total_time(ms): {}, img_num: {}"
.
format
(
total_time
*
1000
,
self
.
img_num
))
self
.
img_num
))
...
@@ -146,13 +154,9 @@ class PipeTimer(Times):
...
@@ -146,13 +154,9 @@ class PipeTimer(Times):
if
v_time
>
0
:
if
v_time
>
0
:
print
(
"{} time(ms): {}"
.
format
(
k
,
v_time
*
1000
))
print
(
"{} time(ms): {}"
.
format
(
k
,
v_time
*
1000
))
average_latency
=
total_time
/
max
(
1
,
self
.
img_num
)
qps
=
0
if
total_time
>
0
:
qps
=
1
/
average_latency
print
(
"average latency time(ms): {:.2f}, QPS: {:2f}"
.
format
(
print
(
"average latency time(ms): {:.2f}, QPS: {:2f}"
.
format
(
average_latency
*
1000
,
qps
))
average_latency
*
1000
,
qps
))
return
qps
def
report
(
self
,
average
=
False
):
def
report
(
self
,
average
=
False
):
dic
=
{}
dic
=
{}
...
...
deploy/pphuman/pipeline.py
浏览文件 @
cff6841a
...
@@ -109,6 +109,8 @@ class Pipeline(object):
...
@@ -109,6 +109,8 @@ class Pipeline(object):
cpu_threads
=
cpu_threads
,
cpu_threads
=
cpu_threads
,
enable_mkldnn
=
enable_mkldnn
,
enable_mkldnn
=
enable_mkldnn
,
output_dir
=
output_dir
)
output_dir
=
output_dir
)
if
self
.
is_video
:
self
.
predictor
.
set_file_name
(
video_file
)
def
_parse_input
(
self
,
image_file
,
image_dir
,
video_file
,
camera_id
):
def
_parse_input
(
self
,
image_file
,
image_dir
,
video_file
,
camera_id
):
...
@@ -234,6 +236,7 @@ class PipePredictor(object):
...
@@ -234,6 +236,7 @@ class PipePredictor(object):
self
.
warmup_frame
=
1
self
.
warmup_frame
=
1
self
.
pipeline_res
=
Result
()
self
.
pipeline_res
=
Result
()
self
.
pipe_timer
=
PipeTimer
()
self
.
pipe_timer
=
PipeTimer
()
self
.
file_name
=
None
if
not
is_video
:
if
not
is_video
:
det_cfg
=
self
.
cfg
[
'DET'
]
det_cfg
=
self
.
cfg
[
'DET'
]
...
@@ -274,6 +277,9 @@ class PipePredictor(object):
...
@@ -274,6 +277,9 @@ class PipePredictor(object):
self
.
kpt_collector
=
KeyPointCollector
()
self
.
kpt_collector
=
KeyPointCollector
()
self
.
action_predictor
=
ActionDetector
()
self
.
action_predictor
=
ActionDetector
()
def
set_file_name
(
self
,
path
):
self
.
file_name
=
os
.
path
.
split
(
path
)[
-
1
]
def
get_result
(
self
):
def
get_result
(
self
):
return
self
.
pipeline_res
return
self
.
pipeline_res
...
@@ -282,7 +288,7 @@ class PipePredictor(object):
...
@@ -282,7 +288,7 @@ class PipePredictor(object):
self
.
predict_video
(
input
)
self
.
predict_video
(
input
)
else
:
else
:
self
.
predict_image
(
input
)
self
.
predict_image
(
input
)
self
.
pipe_timer
.
info
(
True
)
self
.
pipe_timer
.
info
()
def
predict_image
(
self
,
input
):
def
predict_image
(
self
,
input
):
# det
# det
...
@@ -334,7 +340,7 @@ class PipePredictor(object):
...
@@ -334,7 +340,7 @@ class PipePredictor(object):
# mot
# mot
# mot -> attr
# mot -> attr
# mot -> pose -> action
# mot -> pose -> action
video_out_name
=
'output.mp4'
video_out_name
=
'output.mp4'
if
self
.
file_name
is
None
else
self
.
file_name
# Get Video info : resolution, fps, frame count
# Get Video info : resolution, fps, frame count
width
=
int
(
capture
.
get
(
cv2
.
CAP_PROP_FRAME_WIDTH
))
width
=
int
(
capture
.
get
(
cv2
.
CAP_PROP_FRAME_WIDTH
))
...
@@ -366,6 +372,18 @@ class PipePredictor(object):
...
@@ -366,6 +372,18 @@ class PipePredictor(object):
# mot output format: id, class, score, xmin, ymin, xmax, ymax
# mot output format: id, class, score, xmin, ymin, xmax, ymax
mot_res
=
parse_mot_res
(
res
)
mot_res
=
parse_mot_res
(
res
)
# nothing detected
if
len
(
mot_res
[
'boxes'
])
==
0
:
frame_id
+=
1
self
.
pipe_timer
.
img_num
+=
1
self
.
pipe_timer
.
total_time
.
end
()
if
self
.
cfg
[
'visual'
]:
_
,
_
,
fps
=
self
.
pipe_timer
.
get_total_time
()
im
=
self
.
visualize_video
(
frame
,
mot_res
,
frame_id
,
fps
)
# visualize
writer
.
write
(
im
)
continue
self
.
pipeline_res
.
update
(
mot_res
,
'mot'
)
self
.
pipeline_res
.
update
(
mot_res
,
'mot'
)
if
self
.
with_attr
or
self
.
with_action
:
if
self
.
with_attr
or
self
.
with_action
:
crop_input
=
crop_image_with_mot
(
frame
,
mot_res
)
crop_input
=
crop_image_with_mot
(
frame
,
mot_res
)
...
@@ -403,20 +421,25 @@ class PipePredictor(object):
...
@@ -403,20 +421,25 @@ class PipePredictor(object):
self
.
pipeline_res
)
# parse output result for multi-camera
self
.
pipeline_res
)
# parse output result for multi-camera
if
self
.
cfg
[
'visual'
]:
if
self
.
cfg
[
'visual'
]:
im
=
self
.
visualize_video
(
frame
,
self
.
pipeline_res
,
_
,
_
,
fps
=
self
.
pipe_timer
.
get_total_time
()
frame_id
)
# visualize
im
=
self
.
visualize_video
(
frame
,
self
.
pipeline_res
,
frame_id
,
fps
)
# visualize
writer
.
write
(
im
)
writer
.
write
(
im
)
writer
.
release
()
writer
.
release
()
print
(
'save result to {}'
.
format
(
out_path
))
print
(
'save result to {}'
.
format
(
out_path
))
def
visualize_video
(
self
,
image
,
result
,
frame_id
):
def
visualize_video
(
self
,
image
,
result
,
frame_id
,
fps
):
mot_res
=
result
.
get
(
'mot'
)
mot_res
=
result
.
get
(
'mot'
)
ids
=
mot_res
[
'boxes'
][:,
0
]
if
mot_res
is
not
None
:
boxes
=
mot_res
[
'boxes'
][:,
3
:]
ids
=
mot_res
[
'boxes'
][:,
0
]
boxes
[:,
2
]
=
boxes
[:,
2
]
-
boxes
[:,
0
]
boxes
=
mot_res
[
'boxes'
][:,
3
:]
boxes
[:,
3
]
=
boxes
[:,
3
]
-
boxes
[:,
1
]
boxes
[:,
2
]
=
boxes
[:,
2
]
-
boxes
[:,
0
]
image
=
plot_tracking
(
image
,
boxes
,
ids
,
frame_id
=
frame_id
)
boxes
[:,
3
]
=
boxes
[:,
3
]
-
boxes
[:,
1
]
else
:
boxes
=
np
.
zeros
([
0
,
4
])
ids
=
np
.
zeros
([
0
])
image
=
plot_tracking
(
image
,
boxes
,
ids
,
frame_id
=
frame_id
,
fps
=
fps
)
attr_res
=
result
.
get
(
'attr'
)
attr_res
=
result
.
get
(
'attr'
)
if
attr_res
is
not
None
:
if
attr_res
is
not
None
:
...
...
deploy/python/attr_infer.py
浏览文件 @
cff6841a
...
@@ -91,48 +91,82 @@ class AttrDetector(Detector):
...
@@ -91,48 +91,82 @@ class AttrDetector(Detector):
def
postprocess
(
self
,
inputs
,
result
):
def
postprocess
(
self
,
inputs
,
result
):
# postprocess output of predictor
# postprocess output of predictor
im_results
=
result
[
'output'
]
im_results
=
result
[
'output'
]
im_results
=
np
.
where
(
im_results
<
self
.
threshold
,
0
,
im_results
)
label_list
=
[[
'Head'
,
[
'Hat'
,
'Glasses'
]],
[
'Upper'
,
[
'ShortSleeve'
,
'LongSleeve'
,
'UpperStride'
,
'UpperLogo'
,
'UpperPlaid'
,
'UpperSplice'
]
],
[
'Lower'
,
[
'LowerStripe'
,
'LowerPattern'
,
'LongCoat'
,
'Trousers'
,
'Shorts'
,
'Skirt&Dress'
]
],
[
'Shoes'
,
[
'boots'
]],
[
'Accessory'
,
[
'HandBag'
,
'ShoulderBag'
,
'Backpack'
,
'HoldObjectsInFront'
]
],
[
'Age'
,
[
'AgeOver60'
,
'Age18-60'
,
'AgeLess18'
]],
[
'Gender'
,
[
'Female'
]],
[
'Direction'
,
[
'Front'
,
'Side'
,
'Back'
]]]
attr_type
=
[
name
[
0
]
for
name
in
label_list
]
labels
=
self
.
pred_config
.
labels
labels
=
self
.
pred_config
.
labels
age_list
=
[
'AgeLess18'
,
'Age18-60'
,
'AgeOver60'
]
direct_list
=
[
'Front'
,
'Side'
,
'Back'
]
bag_list
=
[
'HandBag'
,
'ShoulderBag'
,
'Backpack'
]
upper_list
=
[
'UpperStride'
,
'UpperLogo'
,
'UpperPlaid'
,
'UpperSplice'
,
'LongCoat'
]
lower_list
=
[
'LowerStripe'
,
'LowerPattern'
,
'Trousers'
,
'Shorts'
,
'Skirt&Dress'
]
batch_res
=
[]
batch_res
=
[]
for
res
in
im_results
:
for
res
in
im_results
:
label_res
=
{}
res
=
res
.
tolist
()
label_res
=
{
t
:
[]
for
t
in
attr_type
}
label_res
=
[]
num
=
0
# gender
for
i
in
range
(
len
(
label_list
)):
gender
=
'Female'
if
res
[
22
]
>
self
.
threshold
else
'Male'
type_name_i
=
attr_type
[
i
]
label_res
.
append
(
gender
)
attr_name_list
=
label_list
[
i
][
1
]
# age
for
attr_name
in
attr_name_list
:
age
=
age_list
[
np
.
argmax
(
res
[
19
:
22
])]
attr_name
=
labels
[
num
]
label_res
.
append
(
age
)
output_prob
=
res
[
num
]
# direction
if
output_prob
!=
0
:
direction
=
direct_list
[
np
.
argmax
(
res
[
23
:])]
label_res
[
type_name_i
].
append
(
attr_name
)
label_res
.
append
(
direction
)
num
+=
1
# glasses
glasses
=
'Glasses: '
if
len
(
label_res
[
'Shoes'
])
==
0
:
if
res
[
1
]
>
self
.
threshold
:
label_res
[
'Shoes'
]
=
[
'no boots'
]
glasses
+=
'True'
if
len
(
label_res
[
'Gender'
])
==
0
:
else
:
label_res
[
'Gender'
]
=
[
'Male'
]
glasses
+=
'False'
label_res
[
'Age'
]
=
[
labels
[
19
+
np
.
argmax
(
res
[
19
:
22
])]]
label_res
.
append
(
glasses
)
label_res
[
'Direction'
]
=
[
labels
[
23
+
np
.
argmax
(
res
[
23
:])]]
# hat
hat
=
'Hat: '
if
res
[
0
]
>
self
.
threshold
:
hat
+=
'True'
else
:
hat
+=
'False'
label_res
.
append
(
hat
)
# hold obj
hold_obj
=
'HoldObjectsInFront: '
if
res
[
18
]
>
self
.
threshold
:
hold_obj
+=
'True'
else
:
hold_obj
+=
'False'
label_res
.
append
(
hold_obj
)
# bag
bag
=
bag_list
[
np
.
argmax
(
res
[
15
:
18
])]
bag_score
=
res
[
15
+
np
.
argmax
(
res
[
15
:
18
])]
bag_label
=
bag
if
bag_score
>
self
.
threshold
else
'No bag'
label_res
.
append
(
bag_label
)
# upper
upper_res
=
res
[
4
:
8
]
+
res
[
10
:
11
]
upper_label
=
'Upper:'
sleeve
=
'LongSleeve'
if
res
[
3
]
>
res
[
2
]
else
'ShortSleeve'
upper_label
+=
' {}'
.
format
(
sleeve
)
for
i
,
r
in
enumerate
(
upper_res
):
if
r
>
self
.
threshold
:
upper_label
+=
' {}'
.
format
(
upper_list
[
i
])
label_res
.
append
(
upper_label
)
# lower
lower_res
=
res
[
8
:
10
]
+
res
[
11
:
14
]
lower_label
=
'Lower: '
has_lower
=
False
for
i
,
l
in
enumerate
(
lower_res
):
if
l
>
self
.
threshold
:
lower_label
+=
' {}'
.
format
(
lower_list
[
i
])
has_lower
=
True
if
not
has_lower
:
lower_label
+=
' {}'
.
format
(
lower_list
[
np
.
argmax
(
lower_res
)])
label_res
.
append
(
lower_label
)
# shoe
shoe
=
'Boots'
if
res
[
14
]
>
self
.
threshold
else
'No boots'
label_res
.
append
(
shoe
)
batch_res
.
append
(
label_res
)
batch_res
.
append
(
label_res
)
result
=
{
'output'
:
batch_res
}
result
=
{
'output'
:
batch_res
}
return
result
return
result
...
@@ -240,7 +274,7 @@ def visualize(image_list, batch_res, output_dir='output'):
...
@@ -240,7 +274,7 @@ def visualize(image_list, batch_res, output_dir='output'):
os
.
makedirs
(
output_dir
)
os
.
makedirs
(
output_dir
)
img_name
=
os
.
path
.
split
(
image_file
)[
-
1
]
img_name
=
os
.
path
.
split
(
image_file
)[
-
1
]
out_path
=
os
.
path
.
join
(
output_dir
,
img_name
)
out_path
=
os
.
path
.
join
(
output_dir
,
img_name
)
im
.
save
(
out_path
,
quality
=
95
)
cv2
.
imwrite
(
out_path
,
im
)
print
(
"save result to: "
+
out_path
)
print
(
"save result to: "
+
out_path
)
...
...
deploy/python/visualize.py
浏览文件 @
cff6841a
...
@@ -331,23 +331,34 @@ def visualize_pose(imgfile,
...
@@ -331,23 +331,34 @@ def visualize_pose(imgfile,
def
visualize_attr
(
im
,
results
,
boxes
=
None
):
def
visualize_attr
(
im
,
results
,
boxes
=
None
):
if
isinstance
(
im
,
str
):
if
isinstance
(
im
,
str
):
im
=
Image
.
open
(
im
).
convert
(
'RGB'
)
im
=
Image
.
open
(
im
)
elif
isinstance
(
im
,
np
.
ndarray
):
im
=
np
.
ascontiguousarray
(
np
.
copy
(
im
))
im
=
Image
.
fromarray
(
im
)
im
=
cv2
.
cvtColor
(
im
,
cv2
.
COLOR_RGB2BGR
)
else
:
im
=
np
.
ascontiguousarray
(
np
.
copy
(
im
))
draw
=
ImageDraw
.
Draw
(
im
)
im_h
,
im_w
=
im
.
shape
[:
2
]
text_scale
=
max
(
1
,
int
(
im
.
shape
[
0
]
/
1600.
))
text_thickness
=
2
line_inter
=
im
.
shape
[
0
]
/
50.
for
i
,
res
in
enumerate
(
results
):
for
i
,
res
in
enumerate
(
results
):
text
=
""
for
k
,
v
in
res
.
items
():
if
len
(
v
)
==
0
:
continue
test_line
=
"{}: {}
\n
"
.
format
(
k
,
*
v
)
text
+=
test_line
if
boxes
is
None
:
if
boxes
is
None
:
text_loc
=
(
1
,
1
)
text_w
=
1
text_h
=
1
else
:
else
:
box
=
boxes
[
i
]
box
=
boxes
[
i
]
text_loc
=
(
box
[
2
],
box
[
3
])
text_w
=
int
(
box
[
2
])
draw
.
text
(
text_loc
,
text
,
fill
=
(
0
,
0
,
255
))
text_h
=
int
(
box
[
3
])
for
text
in
res
:
text_h
+=
int
(
line_inter
)
text_loc
=
(
text_w
,
text_h
)
cv2
.
putText
(
im
,
text
,
text_loc
,
cv2
.
FONT_HERSHEY_PLAIN
,
text_scale
,
(
0
,
0
,
255
),
thickness
=
text_thickness
)
return
im
return
im
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录