Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
7e044196
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看板
未验证
提交
7e044196
编写于
12月 03, 2020
作者:
W
wangguanzhong
提交者:
GitHub
12月 03, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix PadBatch (#1800)
* fix PadBatch * fix PadBatchOp
上级
94f02683
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
22 deletion
+27
-22
ppdet/data/transform/batch_operator.py
ppdet/data/transform/batch_operator.py
+14
-11
ppdet/data/transform/batch_operators.py
ppdet/data/transform/batch_operators.py
+13
-11
未找到文件。
ppdet/data/transform/batch_operator.py
浏览文件 @
7e044196
...
@@ -94,7 +94,8 @@ class PadBatchOp(BaseOperator):
...
@@ -94,7 +94,8 @@ class PadBatchOp(BaseOperator):
if
self
.
pad_gt
:
if
self
.
pad_gt
:
gt_num
=
[]
gt_num
=
[]
if
data
[
'gt_poly'
]
is
not
None
and
len
(
data
[
'gt_poly'
])
>
0
:
if
'gt_poly'
in
data
and
data
[
'gt_poly'
]
is
not
None
and
len
(
data
[
'gt_poly'
])
>
0
:
pad_mask
=
True
pad_mask
=
True
else
:
else
:
pad_mask
=
False
pad_mask
=
False
...
@@ -112,18 +113,20 @@ class PadBatchOp(BaseOperator):
...
@@ -112,18 +113,20 @@ class PadBatchOp(BaseOperator):
for
p_p
in
poly
:
for
p_p
in
poly
:
point_num
.
append
(
int
(
len
(
p_p
)
/
2
))
point_num
.
append
(
int
(
len
(
p_p
)
/
2
))
gt_num_max
=
max
(
gt_num
)
gt_num_max
=
max
(
gt_num
)
gt_box_data
=
np
.
zeros
([
gt_num_max
,
4
])
gt_class_data
=
np
.
zeros
([
gt_num_max
])
is_crowd_data
=
np
.
ones
([
gt_num_max
])
if
pad_mask
:
poly_num_max
=
max
(
poly_num
)
poly_part_num_max
=
max
(
poly_part_num
)
point_num_max
=
max
(
point_num
)
gt_masks_data
=
-
np
.
ones
(
[
poly_num_max
,
poly_part_num_max
,
point_num_max
,
2
])
for
i
,
data
in
enumerate
(
samples
):
for
i
,
data
in
enumerate
(
samples
):
gt_box_data
=
np
.
zeros
([
gt_num_max
,
4
],
dtype
=
np
.
float32
)
gt_class_data
=
np
.
zeros
([
gt_num_max
],
dtype
=
np
.
int32
)
is_crowd_data
=
np
.
ones
([
gt_num_max
],
dtype
=
np
.
int32
)
if
pad_mask
:
poly_num_max
=
max
(
poly_num
)
poly_part_num_max
=
max
(
poly_part_num
)
point_num_max
=
max
(
point_num
)
gt_masks_data
=
-
np
.
ones
(
[
poly_num_max
,
poly_part_num_max
,
point_num_max
,
2
],
dtype
=
np
.
float32
)
gt_num
=
data
[
'gt_bbox'
].
shape
[
0
]
gt_num
=
data
[
'gt_bbox'
].
shape
[
0
]
gt_box_data
[
0
:
gt_num
,
:]
=
data
[
'gt_bbox'
]
gt_box_data
[
0
:
gt_num
,
:]
=
data
[
'gt_bbox'
]
gt_class_data
[
0
:
gt_num
]
=
np
.
squeeze
(
data
[
'gt_class'
])
gt_class_data
[
0
:
gt_num
]
=
np
.
squeeze
(
data
[
'gt_class'
])
...
...
ppdet/data/transform/batch_operators.py
浏览文件 @
7e044196
...
@@ -85,7 +85,8 @@ class PadBatch(BaseOperator):
...
@@ -85,7 +85,8 @@ class PadBatch(BaseOperator):
data
[
'im_info'
][:
2
]
=
max_shape
[
1
:
3
]
data
[
'im_info'
][:
2
]
=
max_shape
[
1
:
3
]
if
self
.
pad_gt
:
if
self
.
pad_gt
:
gt_num
=
[]
gt_num
=
[]
if
data
[
'gt_poly'
]
is
not
None
and
len
(
data
[
'gt_poly'
])
>
0
:
if
'gt_poly'
in
data
and
data
[
'gt_poly'
]
is
not
None
and
len
(
data
[
'gt_poly'
])
>
0
:
pad_mask
=
True
pad_mask
=
True
else
:
else
:
pad_mask
=
False
pad_mask
=
False
...
@@ -103,18 +104,19 @@ class PadBatch(BaseOperator):
...
@@ -103,18 +104,19 @@ class PadBatch(BaseOperator):
for
p_p
in
poly
:
for
p_p
in
poly
:
point_num
.
append
(
int
(
len
(
p_p
)
/
2
))
point_num
.
append
(
int
(
len
(
p_p
)
/
2
))
gt_num_max
=
max
(
gt_num
)
gt_num_max
=
max
(
gt_num
)
gt_box_data
=
np
.
zeros
([
gt_num_max
,
4
])
gt_class_data
=
np
.
zeros
([
gt_num_max
])
is_crowd_data
=
np
.
ones
([
gt_num_max
])
if
pad_mask
:
poly_num_max
=
max
(
poly_num
)
poly_part_num_max
=
max
(
poly_part_num
)
point_num_max
=
max
(
point_num
)
gt_masks_data
=
-
np
.
ones
(
[
poly_num_max
,
poly_part_num_max
,
point_num_max
,
2
])
for
i
,
data
in
enumerate
(
samples
):
for
i
,
data
in
enumerate
(
samples
):
gt_box_data
=
np
.
zeros
([
gt_num_max
,
4
],
dtype
=
np
.
float32
)
gt_class_data
=
np
.
zeros
([
gt_num_max
],
dtype
=
np
.
int32
)
is_crowd_data
=
np
.
ones
([
gt_num_max
],
dtype
=
np
.
int32
)
if
pad_mask
:
poly_num_max
=
max
(
poly_num
)
poly_part_num_max
=
max
(
poly_part_num
)
point_num_max
=
max
(
point_num
)
gt_masks_data
=
-
np
.
ones
(
[
poly_num_max
,
poly_part_num_max
,
point_num_max
,
2
],
dtype
=
np
.
float32
)
gt_num
=
data
[
'gt_bbox'
].
shape
[
0
]
gt_num
=
data
[
'gt_bbox'
].
shape
[
0
]
gt_box_data
[
0
:
gt_num
,
:]
=
data
[
'gt_bbox'
]
gt_box_data
[
0
:
gt_num
,
:]
=
data
[
'gt_bbox'
]
gt_class_data
[
0
:
gt_num
]
=
np
.
squeeze
(
data
[
'gt_class'
])
gt_class_data
[
0
:
gt_num
]
=
np
.
squeeze
(
data
[
'gt_class'
])
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录