fix postprocess (#7684)

ppdet/modeling/architectures/blazeface.py

@@ -74,9 +74,9 @@ class BlazeFace(BaseArch):
                                    self.inputs['gt_class'])
         else:
             preds, anchors = self.blaze_head(neck_feats, self.inputs['image'])
-            bbox, bbox_num = self.post_process(preds, anchors,
-                                               self.inputs['im_shape'],
-                                               self.inputs['scale_factor'])
+            bbox, bbox_num, before_nms_indexes = self.post_process(
+                preds, anchors, self.inputs['im_shape'],
+                self.inputs['scale_factor'])
             return bbox, bbox_num
 
     def get_loss(self, ):

ppdet/modeling/architectures/ssd.py

@@ -75,9 +75,9 @@ class SSD(BaseArch):
                                  self.inputs['gt_class'])
         else:
             preds, anchors = self.ssd_head(body_feats, self.inputs['image'])
-            bbox, bbox_num = self.post_process(preds, anchors,
-                                               self.inputs['im_shape'],
-                                               self.inputs['scale_factor'])
+            bbox, bbox_num, before_nms_indexes = self.post_process(
+                preds, anchors, self.inputs['im_shape'],
+                self.inputs['scale_factor'])
             return bbox, bbox_num
 
     def get_loss(self, ):

ppdet/modeling/heads/fcosr_head.py

@@ -391,5 +391,6 @@ class FCOSRHead(nn.Layer):
             ],
             axis=-1).reshape([-1, 1, 8])
         pred_rboxes /= scale_factor
-        bbox_pred, bbox_num, _ = self.nms(pred_rboxes, pred_scores)
-        return bbox_pred, bbox_num
+        bbox_pred, bbox_num, before_nms_indexes = self.nms(pred_rboxes,
+                                                           pred_scores)
+        return bbox_pred, bbox_num, before_nms_indexes

ppdet/modeling/heads/ppyoloe_r_head.py

@@ -258,7 +258,7 @@ class PPYOLOERHead(nn.Layer):
         pad_gt_mask = gt_meta['pad_gt_mask']
         # label assignment
         if gt_meta['epoch_id'] < self.static_assigner_epoch:
-            assigned_labels, assigned_bboxes, assigned_scores, _ = \
+            assigned_labels, assigned_bboxes, assigned_scores = \
                 self.static_assigner(
                     anchor_points,
                     stride_tensor,
@@ -271,7 +271,7 @@ class PPYOLOERHead(nn.Layer):
                     pred_bboxes.detach()
                 )
         else:
-            assigned_labels, assigned_bboxes, assigned_scores, _ = \
+            assigned_labels, assigned_bboxes, assigned_scores = \
                 self.assigner(
                 pred_scores.detach(),
                 pred_bboxes.detach(),