Revert "fix solov2 infer (PaddlePaddle#4972)" (PaddlePaddle#5074)

This reverts commit 3e0e358.

Author: wangxinxin08

ppdet/engine/trainer.py

@@ -34,7 +34,6 @@
 from ppdet.optimizer import ModelEMA
 
 from ppdet.core.workspace import create
-from ppdet.modeling.architectures.meta_arch import BaseArch
 from ppdet.utils.checkpoint import load_weight, load_pretrain_weight
 from ppdet.utils.visualizer import visualize_results, save_result
 from ppdet.metrics import Metric, COCOMetric, VOCMetric, WiderFaceMetric, get_infer_results, KeyPointTopDownCOCOEval, KeyPointTopDownMPIIEval
@@ -346,10 +345,11 @@ def train(self, validate=False):
         assert self.mode == 'train', "Model not in 'train' mode"
         Init_mark = False
 
-        sync_bn = (getattr(self.cfg, 'norm_type', None) in [None, 'sync_bn'] and
+        sync_bn = (getattr(self.cfg, 'norm_type', None) == 'sync_bn' and
                    self.cfg.use_gpu and self._nranks > 1)
         if sync_bn:
-            self.model = BaseArch.convert_sync_batchnorm(self.model)
+            self.model = paddle.nn.SyncBatchNorm.convert_sync_batchnorm(
+                self.model)
 
         model = self.model
         if self.cfg.get('fleet', False):

ppdet/modeling/architectures/meta_arch.py

@@ -70,7 +70,7 @@ def forward(self, inputs):
                 outs.append(self.get_pred())
 
             # multi-scale test
-            if len(outs) > 1:
+            if len(outs)>1:
                 out = self.merge_multi_scale_predictions(outs)
             else:
                 out = outs[0]
@@ -87,9 +87,7 @@ def merge_multi_scale_predictions(self, outs):
             keep_top_k = self.bbox_post_process.nms.keep_top_k
             nms_threshold = self.bbox_post_process.nms.nms_threshold
         else:
-            raise Exception(
-                "Multi scale test only supports CascadeRCNN, FasterRCNN and MaskRCNN for now"
-            )
+            raise Exception("Multi scale test only supports CascadeRCNN, FasterRCNN and MaskRCNN for now")
 
         final_boxes = []
         all_scale_outs = paddle.concat([o['bbox'] for o in outs]).numpy()
@@ -98,11 +96,9 @@ def merge_multi_scale_predictions(self, outs):
             if np.count_nonzero(idxs) == 0:
                 continue
             r = nms(all_scale_outs[idxs, 1:], nms_threshold)
-            final_boxes.append(
-                np.concatenate([np.full((r.shape[0], 1), c), r], 1))
+            final_boxes.append(np.concatenate([np.full((r.shape[0], 1), c), r], 1))
         out = np.concatenate(final_boxes)
-        out = np.concatenate(sorted(
-            out, key=lambda e: e[1])[-keep_top_k:]).reshape((-1, 6))
+        out = np.concatenate(sorted(out, key=lambda e: e[1])[-keep_top_k:]).reshape((-1, 6))
         out = {
             'bbox': paddle.to_tensor(out),
             'bbox_num': paddle.to_tensor(np.array([out.shape[0], ]))
@@ -124,16 +120,3 @@ def get_loss(self, ):
 
     def get_pred(self, ):
         raise NotImplementedError("Should implement get_pred method!")
-
-    @classmethod
-    def convert_sync_batchnorm(cls, layer):
-        layer_output = layer
-        if getattr(layer, 'norm_type', None) == 'sync_bn':
-            layer_output = nn.SyncBatchNorm.convert_sync_batchnorm(layer)
-        else:
-            for name, sublayer in layer.named_children():
-                layer_output.add_sublayer(name,
-                                          cls.convert_sync_batchnorm(sublayer))
-
-        del layer
-        return layer_output

ppdet/modeling/backbones/esnet.py

@@ -20,7 +20,7 @@
 import paddle.nn as nn
 import paddle.nn.functional as F
 from paddle import ParamAttr
-from paddle.nn import Conv2D, MaxPool2D, AdaptiveAvgPool2D
+from paddle.nn import Conv2D, MaxPool2D, AdaptiveAvgPool2D, BatchNorm
 from paddle.nn.initializer import KaimingNormal
 from paddle.regularizer import L2Decay