From 1c923ffe420959b1f553380a54b7aa611eb7a040 Mon Sep 17 00:00:00 2001 From: Feng Ni Date: Wed, 8 Feb 2023 17:07:20 +0800 Subject: [PATCH] fix ppyoloe_contrast_head aux_pred input (#7705) --- ppdet/modeling/heads/ppyoloe_contrast_head.py | 45 +++++++------------ 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/ppdet/modeling/heads/ppyoloe_contrast_head.py b/ppdet/modeling/heads/ppyoloe_contrast_head.py index 4f80ea9c7..df61194ed 100644 --- a/ppdet/modeling/heads/ppyoloe_contrast_head.py +++ b/ppdet/modeling/heads/ppyoloe_contrast_head.py @@ -27,6 +27,7 @@ from ppdet.modeling.layers import MultiClassNMS from ppdet.modeling.heads.ppyoloe_head import PPYOLOEHead __all__ = ['PPYOLOEContrastHead'] + @register class PPYOLOEContrastHead(PPYOLOEHead): __shared__ = [ @@ -60,33 +61,18 @@ class PPYOLOEContrastHead(PPYOLOEHead): exclude_nms=False, exclude_post_process=False, use_shared_conv=True): - super().__init__(in_channels, - num_classes, - act, - fpn_strides, - grid_cell_scale, - grid_cell_offset, - reg_max, - reg_range, - static_assigner_epoch, - use_varifocal_loss, - static_assigner, - assigner, - nms, - eval_size, - loss_weight, - trt, - exclude_nms, - exclude_post_process, - use_shared_conv) - + super().__init__(in_channels, num_classes, act, fpn_strides, + grid_cell_scale, grid_cell_offset, reg_max, reg_range, + static_assigner_epoch, use_varifocal_loss, + static_assigner, assigner, nms, eval_size, loss_weight, + trt, exclude_nms, exclude_post_process, + use_shared_conv) + assert len(in_channels) > 0, "len(in_channels) should > 0" self.contrast_loss = contrast_loss self.contrast_encoder = nn.LayerList() for in_c in self.in_channels: - self.contrast_encoder.append( - nn.Conv2D( - in_c, 128, 3, padding=1)) + self.contrast_encoder.append(nn.Conv2D(in_c, 128, 3, padding=1)) self._init_contrast_encoder() def _init_contrast_encoder(self): @@ -95,7 +81,7 @@ class PPYOLOEContrastHead(PPYOLOEHead): constant_(en_.weight) constant_(en_.bias, bias_en) - def forward_train(self, feats, targets): + def forward_train(self, feats, targets, aux_pred=None): anchors, anchor_points, num_anchors_list, stride_tensor = \ generate_anchors_for_grid_cell( feats, self.fpn_strides, self.grid_cell_scale, @@ -108,9 +94,10 @@ class PPYOLOEContrastHead(PPYOLOEHead): cls_logit = self.pred_cls[i](self.stem_cls[i](feat, avg_feat) + feat) reg_distri = self.pred_reg[i](self.stem_reg[i](feat, avg_feat)) - contrast_logit = self.contrast_encoder[i](self.stem_cls[i](feat, avg_feat) + - feat) - contrast_encoder_list.append(contrast_logit.flatten(2).transpose([0, 2, 1])) + contrast_logit = self.contrast_encoder[i](self.stem_cls[i]( + feat, avg_feat) + feat) + contrast_encoder_list.append( + contrast_logit.flatten(2).transpose([0, 2, 1])) # cls and reg cls_score = F.sigmoid(cls_logit) cls_score_list.append(cls_score.flatten(2).transpose([0, 2, 1])) @@ -120,8 +107,8 @@ class PPYOLOEContrastHead(PPYOLOEHead): contrast_encoder_list = paddle.concat(contrast_encoder_list, axis=1) return self.get_loss([ - cls_score_list, reg_distri_list, contrast_encoder_list, anchors, anchor_points, - num_anchors_list, stride_tensor + cls_score_list, reg_distri_list, contrast_encoder_list, anchors, + anchor_points, num_anchors_list, stride_tensor ], targets) def get_loss(self, head_outs, gt_meta): -- GitLab