Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
9ae434f8
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看板
未验证
提交
9ae434f8
编写于
7月 27, 2021
作者:
Z
zhiboniu
提交者:
GitHub
7月 27, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add mpii infer support (#3782)
上级
0f2e9a5b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
66 addition
and
27 deletion
+66
-27
deploy/python/visualize.py
deploy/python/visualize.py
+3
-1
ppdet/data/source/category.py
ppdet/data/source/category.py
+2
-1
ppdet/engine/trainer.py
ppdet/engine/trainer.py
+10
-5
ppdet/metrics/keypoint_metrics.py
ppdet/metrics/keypoint_metrics.py
+1
-1
ppdet/utils/visualizer.py
ppdet/utils/visualizer.py
+50
-19
未找到文件。
deploy/python/visualize.py
浏览文件 @
9ae434f8
...
...
@@ -240,7 +240,9 @@ def draw_pose(imgfile,
raise
e
skeletons
,
scores
=
results
[
'keypoint'
]
kpt_nums
=
skeletons
.
shape
[
1
]
kpt_nums
=
17
if
len
(
skeletons
)
>
0
:
kpt_nums
=
skeletons
.
shape
[
1
]
if
kpt_nums
==
17
:
#plot coco keypoint
EDGES
=
[(
0
,
1
),
(
0
,
2
),
(
1
,
3
),
(
2
,
4
),
(
3
,
5
),
(
4
,
6
),
(
5
,
7
),
(
6
,
8
),
(
7
,
9
),
(
8
,
10
),
(
5
,
11
),
(
6
,
12
),
(
11
,
13
),
(
12
,
14
),
...
...
ppdet/data/source/category.py
浏览文件 @
9ae434f8
...
...
@@ -83,7 +83,8 @@ def get_categories(metric_type, anno_file=None, arch=None):
elif
metric_type
.
lower
()
==
'widerface'
:
return
_widerface_category
()
elif
metric_type
.
lower
()
==
'keypointtopdowncocoeval'
:
elif
metric_type
.
lower
()
==
'keypointtopdowncocoeval'
or
metric_type
.
lower
(
)
==
'keypointtopdownmpiieval'
:
return
(
None
,
{
'id'
:
'keypoint'
})
elif
metric_type
.
lower
()
in
[
'mot'
,
'motdet'
,
'reid'
]:
...
...
ppdet/engine/trainer.py
浏览文件 @
9ae434f8
...
...
@@ -292,6 +292,7 @@ class Trainer(object):
def
train
(
self
,
validate
=
False
):
assert
self
.
mode
==
'train'
,
"Model not in 'train' mode"
Init_mark
=
False
# if validation in training is enabled, metrics should be re-init
if
validate
:
...
...
@@ -394,6 +395,12 @@ class Trainer(object):
self
.
_eval_dataset
,
self
.
cfg
.
worker_num
,
batch_sampler
=
self
.
_eval_batch_sampler
)
# if validation in training is enabled, metrics should be re-init
# Init_mark makes sure this code will only execute once
if
validate
and
Init_mark
==
False
:
Init_mark
=
True
self
.
_init_metrics
(
validate
=
validate
)
self
.
_reset_metrics
()
with
paddle
.
no_grad
():
self
.
status
[
'save_best_model'
]
=
True
self
.
_eval_with_loader
(
self
.
_eval_loader
)
...
...
@@ -558,14 +565,12 @@ class Trainer(object):
shape
=
[
None
,
3
,
192
,
64
],
name
=
'crops'
)
})
static_model
=
paddle
.
jit
.
to_static
(
self
.
model
,
input_spec
=
input_spec
)
static_model
=
paddle
.
jit
.
to_static
(
self
.
model
,
input_spec
=
input_spec
)
# NOTE: dy2st do not pruned program, but jit.save will prune program
# input spec, prune input spec here and save with pruned input spec
pruned_input_spec
=
self
.
_prune_input_spec
(
input_spec
,
static_model
.
forward
.
main_program
,
static_model
.
forward
.
outputs
)
input_spec
,
static_model
.
forward
.
main_program
,
static_model
.
forward
.
outputs
)
# dy2st and save model
if
'slim'
not
in
self
.
cfg
or
self
.
cfg
[
'slim_type'
]
!=
'QAT'
:
...
...
ppdet/metrics/keypoint_metrics.py
浏览文件 @
9ae434f8
...
...
@@ -14,7 +14,7 @@
import
os
import
json
from
collections
import
defaultdict
from
collections
import
defaultdict
,
OrderedDict
import
numpy
as
np
from
pycocotools.coco
import
COCO
from
pycocotools.cocoeval
import
COCOeval
...
...
ppdet/utils/visualizer.py
浏览文件 @
9ae434f8
...
...
@@ -218,23 +218,35 @@ def draw_segm(image,
return
Image
.
fromarray
(
img_array
.
astype
(
'uint8'
))
def
map_coco_to_personlab
(
keypoints
):
permute
=
[
0
,
6
,
8
,
10
,
5
,
7
,
9
,
12
,
14
,
16
,
11
,
13
,
15
,
2
,
1
,
4
,
3
]
return
keypoints
[:,
permute
,
:]
def
draw_pose
(
image
,
results
,
visual_thread
=
0.6
,
save_name
=
'pose.jpg'
):
def
draw_pose
(
image
,
results
,
visual_thread
=
0.6
,
save_name
=
'pose.jpg'
,
save_dir
=
'output'
,
returnimg
=
False
,
ids
=
None
):
try
:
import
matplotlib.pyplot
as
plt
import
matplotlib
plt
.
switch_backend
(
'agg'
)
except
Exception
as
e
:
logger
.
error
(
'Matplotlib not found, pl
ae
se install matplotlib.'
logger
.
error
(
'Matplotlib not found, pl
ea
se install matplotlib.'
'for example: `pip install matplotlib`.'
)
raise
e
EDGES
=
[(
0
,
14
),
(
0
,
13
),
(
0
,
4
),
(
0
,
1
),
(
14
,
16
),
(
13
,
15
),
(
4
,
10
),
(
1
,
7
),
(
10
,
11
),
(
7
,
8
),
(
11
,
12
),
(
8
,
9
),
(
4
,
5
),
(
1
,
2
),
(
5
,
6
),
(
2
,
3
)]
skeletons
=
np
.
array
([
item
[
'keypoints'
]
for
item
in
results
])
kpt_nums
=
17
if
len
(
skeletons
)
>
0
:
kpt_nums
=
int
(
skeletons
.
shape
[
1
]
/
3
)
skeletons
=
skeletons
.
reshape
(
-
1
,
kpt_nums
,
3
)
if
kpt_nums
==
17
:
#plot coco keypoint
EDGES
=
[(
0
,
1
),
(
0
,
2
),
(
1
,
3
),
(
2
,
4
),
(
3
,
5
),
(
4
,
6
),
(
5
,
7
),
(
6
,
8
),
(
7
,
9
),
(
8
,
10
),
(
5
,
11
),
(
6
,
12
),
(
11
,
13
),
(
12
,
14
),
(
13
,
15
),
(
14
,
16
),
(
11
,
12
)]
else
:
#plot mpii keypoint
EDGES
=
[(
0
,
1
),
(
1
,
2
),
(
3
,
4
),
(
4
,
5
),
(
2
,
6
),
(
3
,
6
),
(
6
,
7
),
(
7
,
8
),
(
8
,
9
),
(
10
,
11
),
(
11
,
12
),
(
13
,
14
),
(
14
,
15
),
(
8
,
12
),
(
8
,
13
)]
NUM_EDGES
=
len
(
EDGES
)
colors
=
[[
255
,
0
,
0
],
[
255
,
85
,
0
],
[
255
,
170
,
0
],
[
255
,
255
,
0
],
[
170
,
255
,
0
],
[
85
,
255
,
0
],
[
0
,
255
,
0
],
\
...
...
@@ -242,22 +254,36 @@ def draw_pose(image, results, visual_thread=0.6, save_name='pose.jpg'):
[
170
,
0
,
255
],
[
255
,
0
,
255
],
[
255
,
0
,
170
],
[
255
,
0
,
85
]]
cmap
=
matplotlib
.
cm
.
get_cmap
(
'hsv'
)
plt
.
figure
()
skeletons
=
np
.
array
([
item
[
'keypoints'
]
for
item
in
results
]).
reshape
(
-
1
,
17
,
3
)
img
=
np
.
array
(
image
).
astype
(
'float32'
)
canvas
=
img
.
copy
()
for
i
in
range
(
17
):
rgba
=
np
.
array
(
cmap
(
1
-
i
/
17.
-
1.
/
34
))
rgba
[
0
:
3
]
*=
255
color_set
=
results
[
'colors'
]
if
'colors'
in
results
else
None
if
'bbox'
in
results
and
ids
is
None
:
bboxs
=
results
[
'bbox'
]
for
j
,
rect
in
enumerate
(
bboxs
):
xmin
,
ymin
,
xmax
,
ymax
=
rect
color
=
colors
[
0
]
if
color_set
is
None
else
colors
[
color_set
[
j
]
%
len
(
colors
)]
cv2
.
rectangle
(
img
,
(
xmin
,
ymin
),
(
xmax
,
ymax
),
color
,
1
)
canvas
=
img
.
copy
()
for
i
in
range
(
kpt_nums
):
for
j
in
range
(
len
(
skeletons
)):
if
skeletons
[
j
][
i
,
2
]
<
visual_thread
:
continue
if
ids
is
None
:
color
=
colors
[
i
]
if
color_set
is
None
else
colors
[
color_set
[
j
]
%
len
(
colors
)]
else
:
color
=
get_color
(
ids
[
j
])
cv2
.
circle
(
canvas
,
tuple
(
skeletons
[
j
][
i
,
0
:
2
].
astype
(
'int32'
)),
2
,
color
s
[
i
]
,
color
,
thickness
=-
1
)
to_plot
=
cv2
.
addWeighted
(
img
,
0.3
,
canvas
,
0.7
,
0
)
...
...
@@ -265,7 +291,6 @@ def draw_pose(image, results, visual_thread=0.6, save_name='pose.jpg'):
stickwidth
=
2
skeletons
=
map_coco_to_personlab
(
skeletons
)
for
i
in
range
(
NUM_EDGES
):
for
j
in
range
(
len
(
skeletons
)):
edge
=
EDGES
[
i
]
...
...
@@ -283,7 +308,13 @@ def draw_pose(image, results, visual_thread=0.6, save_name='pose.jpg'):
polygon
=
cv2
.
ellipse2Poly
((
int
(
mY
),
int
(
mX
)),
(
int
(
length
/
2
),
stickwidth
),
int
(
angle
),
0
,
360
,
1
)
cv2
.
fillConvexPoly
(
cur_canvas
,
polygon
,
colors
[
i
])
if
ids
is
None
:
color
=
colors
[
i
]
if
color_set
is
None
else
colors
[
color_set
[
j
]
%
len
(
colors
)]
else
:
color
=
get_color
(
ids
[
j
])
cv2
.
fillConvexPoly
(
cur_canvas
,
polygon
,
color
)
canvas
=
cv2
.
addWeighted
(
canvas
,
0.4
,
cur_canvas
,
0.6
,
0
)
image
=
Image
.
fromarray
(
canvas
.
astype
(
'uint8'
))
plt
.
close
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录