Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
2285e0c9
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看板
未验证
提交
2285e0c9
编写于
4月 25, 2023
作者:
J
JYChen
提交者:
GitHub
4月 25, 2023
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix training error brought by 0-d getitem (#8140)
* fix training error brought by 0-d getitem * fix other model
上级
70dbf936
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
33 addition
and
19 deletion
+33
-19
ppdet/modeling/architectures/faster_rcnn.py
ppdet/modeling/architectures/faster_rcnn.py
+16
-11
ppdet/modeling/heads/cascade_head.py
ppdet/modeling/heads/cascade_head.py
+1
-1
ppdet/modeling/heads/s2anet_head.py
ppdet/modeling/heads/s2anet_head.py
+1
-1
ppdet/modeling/heads/tood_head.py
ppdet/modeling/heads/tood_head.py
+8
-2
ppdet/modeling/proposal_generator/target.py
ppdet/modeling/proposal_generator/target.py
+3
-3
ppdet/modeling/transformers/deformable_transformer.py
ppdet/modeling/transformers/deformable_transformer.py
+4
-1
未找到文件。
ppdet/modeling/architectures/faster_rcnn.py
浏览文件 @
2285e0c9
...
@@ -86,15 +86,16 @@ class FasterRCNN(BaseArch):
...
@@ -86,15 +86,16 @@ class FasterRCNN(BaseArch):
preds
,
_
=
self
.
bbox_head
(
body_feats
,
rois
,
rois_num
,
None
)
preds
,
_
=
self
.
bbox_head
(
body_feats
,
rois
,
rois_num
,
None
)
im_shape
=
self
.
inputs
[
'im_shape'
]
im_shape
=
self
.
inputs
[
'im_shape'
]
scale_factor
=
self
.
inputs
[
'scale_factor'
]
scale_factor
=
self
.
inputs
[
'scale_factor'
]
bbox
,
bbox_num
,
nms_keep_idx
=
self
.
bbox_post_process
(
preds
,
(
rois
,
rois_num
),
bbox
,
bbox_num
,
nms_keep_idx
=
self
.
bbox_post_process
(
im_shape
,
scale_factor
)
preds
,
(
rois
,
rois_num
),
im_shape
,
scale_factor
)
# rescale the prediction back to origin image
# rescale the prediction back to origin image
bboxes
,
bbox_pred
,
bbox_num
=
self
.
bbox_post_process
.
get_pred
(
bboxes
,
bbox_pred
,
bbox_num
=
self
.
bbox_post_process
.
get_pred
(
bbox
,
bbox_num
,
im_shape
,
scale_factor
)
bbox
,
bbox_num
,
im_shape
,
scale_factor
)
if
self
.
use_extra_data
:
if
self
.
use_extra_data
:
extra_data
=
{}
# record the bbox output before nms, such like scores and nms_keep_idx
extra_data
=
{
}
# record the bbox output before nms, such like scores and nms_keep_idx
"""extra_data:{
"""extra_data:{
'scores': predict scores,
'scores': predict scores,
'nms_keep_idx': bbox index before nms,
'nms_keep_idx': bbox index before nms,
...
@@ -102,12 +103,12 @@ class FasterRCNN(BaseArch):
...
@@ -102,12 +103,12 @@ class FasterRCNN(BaseArch):
"""
"""
extra_data
[
'scores'
]
=
preds
[
1
]
# predict scores (probability)
extra_data
[
'scores'
]
=
preds
[
1
]
# predict scores (probability)
# Todo: get logits output
# Todo: get logits output
extra_data
[
'nms_keep_idx'
]
=
nms_keep_idx
# bbox index before nms
extra_data
[
'nms_keep_idx'
]
=
nms_keep_idx
# bbox index before nms
return
bbox_pred
,
bbox_num
,
extra_data
return
bbox_pred
,
bbox_num
,
extra_data
else
:
else
:
return
bbox_pred
,
bbox_num
return
bbox_pred
,
bbox_num
def
get_loss
(
self
,
):
def
get_loss
(
self
,
):
rpn_loss
,
bbox_loss
=
self
.
_forward
()
rpn_loss
,
bbox_loss
=
self
.
_forward
()
loss
=
{}
loss
=
{}
...
@@ -120,7 +121,11 @@ class FasterRCNN(BaseArch):
...
@@ -120,7 +121,11 @@ class FasterRCNN(BaseArch):
def
get_pred
(
self
):
def
get_pred
(
self
):
if
self
.
use_extra_data
:
if
self
.
use_extra_data
:
bbox_pred
,
bbox_num
,
extra_data
=
self
.
_forward
()
bbox_pred
,
bbox_num
,
extra_data
=
self
.
_forward
()
output
=
{
'bbox'
:
bbox_pred
,
'bbox_num'
:
bbox_num
,
'extra_data'
:
extra_data
}
output
=
{
'bbox'
:
bbox_pred
,
'bbox_num'
:
bbox_num
,
'extra_data'
:
extra_data
}
else
:
else
:
bbox_pred
,
bbox_num
=
self
.
_forward
()
bbox_pred
,
bbox_num
=
self
.
_forward
()
output
=
{
'bbox'
:
bbox_pred
,
'bbox_num'
:
bbox_num
}
output
=
{
'bbox'
:
bbox_pred
,
'bbox_num'
:
bbox_num
}
...
@@ -131,7 +136,7 @@ class FasterRCNN(BaseArch):
...
@@ -131,7 +136,7 @@ class FasterRCNN(BaseArch):
if
self
.
neck
is
not
None
:
if
self
.
neck
is
not
None
:
body_feats
=
self
.
neck
(
body_feats
)
body_feats
=
self
.
neck
(
body_feats
)
rois
=
[
roi
for
roi
in
data
[
'gt_bbox'
]]
rois
=
[
roi
for
roi
in
data
[
'gt_bbox'
]]
rois_num
=
paddle
.
concat
([
paddle
.
shape
(
roi
)[
0
]
for
roi
in
rois
])
rois_num
=
paddle
.
concat
([
paddle
.
shape
(
roi
)[
0
:
1
]
for
roi
in
rois
])
preds
,
_
=
self
.
bbox_head
(
body_feats
,
rois
,
rois_num
,
None
,
cot
=
True
)
preds
,
_
=
self
.
bbox_head
(
body_feats
,
rois
,
rois_num
,
None
,
cot
=
True
)
return
preds
return
preds
...
@@ -148,7 +153,7 @@ class FasterRCNN(BaseArch):
...
@@ -148,7 +153,7 @@ class FasterRCNN(BaseArch):
num_bbox
=
data
[
'gt_class'
][
i
].
shape
[
0
]
num_bbox
=
data
[
'gt_class'
][
i
].
shape
[
0
]
train_labels
=
data
[
'gt_class'
][
i
]
train_labels
=
data
[
'gt_class'
][
i
]
train_labels_list
.
append
(
train_labels
.
numpy
().
squeeze
(
1
))
train_labels_list
.
append
(
train_labels
.
numpy
().
squeeze
(
1
))
base_labels
=
bbox_prob
.
detach
().
numpy
()[:,:
-
1
]
base_labels
=
bbox_prob
.
detach
().
numpy
()[:,
:
-
1
]
label_list
.
append
(
base_labels
)
label_list
.
append
(
base_labels
)
labels
=
np
.
concatenate
(
train_labels_list
,
0
)
labels
=
np
.
concatenate
(
train_labels_list
,
0
)
...
...
ppdet/modeling/heads/cascade_head.py
浏览文件 @
2285e0c9
...
@@ -301,7 +301,7 @@ class CascadeHead(BBoxHead):
...
@@ -301,7 +301,7 @@ class CascadeHead(BBoxHead):
keep
=
paddle
.
zeros
([
1
],
dtype
=
'int32'
)
keep
=
paddle
.
zeros
([
1
],
dtype
=
'int32'
)
clip_box
=
paddle
.
gather
(
clip_box
,
keep
)
clip_box
=
paddle
.
gather
(
clip_box
,
keep
)
rois
.
append
(
clip_box
)
rois
.
append
(
clip_box
)
rois_num
=
paddle
.
concat
([
paddle
.
shape
(
r
)[
0
]
for
r
in
rois
])
rois_num
=
paddle
.
concat
([
paddle
.
shape
(
r
)[
0
:
1
]
for
r
in
rois
])
return
rois
,
rois_num
return
rois
,
rois_num
def
_get_pred_bbox
(
self
,
deltas
,
proposals
,
weights
):
def
_get_pred_bbox
(
self
,
deltas
,
proposals
,
weights
):
...
...
ppdet/modeling/heads/s2anet_head.py
浏览文件 @
2285e0c9
...
@@ -360,7 +360,7 @@ class S2ANetHead(nn.Layer):
...
@@ -360,7 +360,7 @@ class S2ANetHead(nn.Layer):
for
i
in
range
(
bbox_num
.
shape
[
0
]):
for
i
in
range
(
bbox_num
.
shape
[
0
]):
expand_shape
=
paddle
.
expand
(
origin_shape
[
i
:
i
+
1
,
:],
expand_shape
=
paddle
.
expand
(
origin_shape
[
i
:
i
+
1
,
:],
[
bbox_num
[
i
],
2
])
[
bbox_num
[
i
],
2
])
scale_y
,
scale_x
=
scale_factor
[
i
][
0
],
scale_factor
[
i
][
1
]
scale_y
,
scale_x
=
scale_factor
[
i
,
0
:
1
],
scale_factor
[
i
,
1
:
2
]
scale
=
paddle
.
concat
([
scale
=
paddle
.
concat
([
scale_x
,
scale_y
,
scale_x
,
scale_y
,
scale_x
,
scale_y
,
scale_x
,
scale_x
,
scale_y
,
scale_x
,
scale_y
,
scale_x
,
scale_y
,
scale_x
,
scale_y
scale_y
...
...
ppdet/modeling/heads/tood_head.py
浏览文件 @
2285e0c9
...
@@ -86,7 +86,10 @@ class TaskDecomposition(nn.Layer):
...
@@ -86,7 +86,10 @@ class TaskDecomposition(nn.Layer):
normal_
(
self
.
la_conv2
.
weight
,
std
=
0.001
)
normal_
(
self
.
la_conv2
.
weight
,
std
=
0.001
)
def
forward
(
self
,
feat
,
avg_feat
):
def
forward
(
self
,
feat
,
avg_feat
):
b
,
_
,
h
,
w
=
get_static_shape
(
feat
)
feat_shape
=
get_static_shape
(
feat
)
b
=
feat_shape
[
0
:
1
]
h
=
feat_shape
[
2
:
3
]
w
=
feat_shape
[
3
:
4
]
weight
=
F
.
relu
(
self
.
la_conv1
(
avg_feat
))
weight
=
F
.
relu
(
self
.
la_conv1
(
avg_feat
))
weight
=
F
.
sigmoid
(
self
.
la_conv2
(
weight
)).
unsqueeze
(
-
1
)
weight
=
F
.
sigmoid
(
self
.
la_conv2
(
weight
)).
unsqueeze
(
-
1
)
feat
=
paddle
.
reshape
(
feat
=
paddle
.
reshape
(
...
@@ -204,7 +207,10 @@ class TOODHead(nn.Layer):
...
@@ -204,7 +207,10 @@ class TOODHead(nn.Layer):
constant_
(
self
.
reg_offset_conv2
.
bias
)
constant_
(
self
.
reg_offset_conv2
.
bias
)
def
_reg_grid_sample
(
self
,
feat
,
offset
,
anchor_points
):
def
_reg_grid_sample
(
self
,
feat
,
offset
,
anchor_points
):
b
,
_
,
h
,
w
=
get_static_shape
(
feat
)
feat_shape
=
get_static_shape
(
feat
)
b
=
feat_shape
[
0
:
1
]
h
=
feat_shape
[
2
:
3
]
w
=
feat_shape
[
3
:
4
]
feat
=
paddle
.
reshape
(
feat
,
[
-
1
,
1
,
h
,
w
])
feat
=
paddle
.
reshape
(
feat
,
[
-
1
,
1
,
h
,
w
])
offset
=
paddle
.
reshape
(
offset
,
[
-
1
,
2
,
h
,
w
]).
transpose
([
0
,
2
,
3
,
1
])
offset
=
paddle
.
reshape
(
offset
,
[
-
1
,
2
,
h
,
w
]).
transpose
([
0
,
2
,
3
,
1
])
grid_shape
=
paddle
.
concat
([
w
,
h
]).
astype
(
'float32'
)
grid_shape
=
paddle
.
concat
([
w
,
h
]).
astype
(
'float32'
)
...
...
ppdet/modeling/proposal_generator/target.py
浏览文件 @
2285e0c9
...
@@ -237,7 +237,7 @@ def generate_proposal_target(rpn_rois,
...
@@ -237,7 +237,7 @@ def generate_proposal_target(rpn_rois,
tgt_bboxes
.
append
(
sampled_bbox
)
tgt_bboxes
.
append
(
sampled_bbox
)
rois_with_gt
.
append
(
rois_per_image
)
rois_with_gt
.
append
(
rois_per_image
)
tgt_gt_inds
.
append
(
sampled_gt_ind
)
tgt_gt_inds
.
append
(
sampled_gt_ind
)
new_rois_num
.
append
(
paddle
.
shape
(
sampled_inds
)[
0
])
new_rois_num
.
append
(
paddle
.
shape
(
sampled_inds
)[
0
:
1
])
new_rois_num
=
paddle
.
concat
(
new_rois_num
)
new_rois_num
=
paddle
.
concat
(
new_rois_num
)
return
rois_with_gt
,
tgt_labels
,
tgt_bboxes
,
tgt_gt_inds
,
new_rois_num
return
rois_with_gt
,
tgt_labels
,
tgt_bboxes
,
tgt_gt_inds
,
new_rois_num
...
@@ -380,7 +380,7 @@ def generate_mask_target(gt_segms, rois, labels_int32, sampled_gt_inds,
...
@@ -380,7 +380,7 @@ def generate_mask_target(gt_segms, rois, labels_int32, sampled_gt_inds,
mask_index
.
append
(
fg_inds
)
mask_index
.
append
(
fg_inds
)
mask_rois
.
append
(
fg_rois
)
mask_rois
.
append
(
fg_rois
)
mask_rois_num
.
append
(
paddle
.
shape
(
fg_rois
)[
0
])
mask_rois_num
.
append
(
paddle
.
shape
(
fg_rois
)[
0
:
1
])
tgt_classes
.
append
(
fg_classes
)
tgt_classes
.
append
(
fg_classes
)
tgt_masks
.
append
(
tgt_mask
)
tgt_masks
.
append
(
tgt_mask
)
tgt_weights
.
append
(
weight
)
tgt_weights
.
append
(
weight
)
...
@@ -672,7 +672,7 @@ def libra_generate_proposal_target(rpn_rois,
...
@@ -672,7 +672,7 @@ def libra_generate_proposal_target(rpn_rois,
rois_with_gt
.
append
(
rois_per_image
)
rois_with_gt
.
append
(
rois_per_image
)
sampled_max_overlaps
.
append
(
sampled_overlap
)
sampled_max_overlaps
.
append
(
sampled_overlap
)
tgt_gt_inds
.
append
(
sampled_gt_ind
)
tgt_gt_inds
.
append
(
sampled_gt_ind
)
new_rois_num
.
append
(
paddle
.
shape
(
sampled_inds
)[
0
])
new_rois_num
.
append
(
paddle
.
shape
(
sampled_inds
)[
0
:
1
])
new_rois_num
=
paddle
.
concat
(
new_rois_num
)
new_rois_num
=
paddle
.
concat
(
new_rois_num
)
# rois_with_gt, tgt_labels, tgt_bboxes, tgt_gt_inds, new_rois_num
# rois_with_gt, tgt_labels, tgt_bboxes, tgt_gt_inds, new_rois_num
return
rois_with_gt
,
tgt_labels
,
tgt_bboxes
,
tgt_gt_inds
,
new_rois_num
return
rois_with_gt
,
tgt_labels
,
tgt_bboxes
,
tgt_gt_inds
,
new_rois_num
ppdet/modeling/transformers/deformable_transformer.py
浏览文件 @
2285e0c9
...
@@ -486,7 +486,10 @@ class DeformableTransformer(nn.Layer):
...
@@ -486,7 +486,10 @@ class DeformableTransformer(nn.Layer):
spatial_shapes
=
[]
spatial_shapes
=
[]
valid_ratios
=
[]
valid_ratios
=
[]
for
level
,
src
in
enumerate
(
srcs
):
for
level
,
src
in
enumerate
(
srcs
):
bs
,
_
,
h
,
w
=
paddle
.
shape
(
src
)
src_shape
=
paddle
.
shape
(
src
)
bs
=
src_shape
[
0
:
1
]
h
=
src_shape
[
2
:
3
]
w
=
src_shape
[
3
:
4
]
spatial_shapes
.
append
(
paddle
.
concat
([
h
,
w
]))
spatial_shapes
.
append
(
paddle
.
concat
([
h
,
w
]))
src
=
src
.
flatten
(
2
).
transpose
([
0
,
2
,
1
])
src
=
src
.
flatten
(
2
).
transpose
([
0
,
2
,
1
])
src_flatten
.
append
(
src
)
src_flatten
.
append
(
src
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录