update readme and yolov6lite init

Author: CycloneBoy

README.md

@@ -26,6 +26,7 @@ This project aims to:
 
 **RECENT UPDATED**
 
+- 2023-05-31 fix issue #1 yolov6 infer update
 - 2023-05-26 Migration model inference part: rt-detr(RT-DETR-R50-m,RT-DETR-R34,RT-DETR-R18)
 - 2023-04-25 Migration model inference part: rt-detr(DETRs Beat YOLOs on Real-time Object Detection)
 - 2023-02-13 Migration model inference part: retinanet

README_cn.md

@@ -26,6 +26,7 @@
 
 **近期更新**
 
+- 2023-05-31 修复问题issue #1 yolov6 推理部分
 - 2023-05-26 迁移模型推理部分: rt-detr(RT-DETR-R50-m,RT-DETR-R34,RT-DETR-R18)
 - 2023-04-25 迁移模型推理部分: rt-detr(DETRs Beat YOLOs on Real-time Object Detection)
 - 2023-02-03 迁移模型推理部分：retinanet

README_en.md

@@ -23,6 +23,7 @@ This project aims to:
 
 **RECENT UPDATED**
 
+- 2023-05-31 fix issue #1 yolov6 infer update
 - 2023-05-26 Migration model inference part: rt-detr(RT-DETR-R50-m,RT-DETR-R34,RT-DETR-R18)
 - 2023-04-25 Migration model inference part: rt-detr(DETRs Beat YOLOs on Real-time Object Detection)
 - 2023-02-13 Migration model inference part: retinanet

ppdettorch/modeling/backbones/yolov6_efficientrep.py

@@ -26,17 +26,11 @@
 __all__ = ['EfficientRep', 'CSPBepBackbone', 'Lite_EffiBackbone']
 
 
-def get_activation(name="silu"):
-    if name == "silu":
-        module = nn.SiLU()
-    elif name == "relu":
-        module = nn.ReLU()
-    elif name in ["LeakyReLU", 'leakyrelu', 'lrelu']:
-        module = nn.LeakyReLU(0.1)
-    else:
-        raise AttributeError("Unsupported act type: {}".format(name))
-    return module
-
+activation_table = {
+    'relu': nn.ReLU(),
+    'silu': nn.SiLU(),
+    'hardswish': nn.Hardswish()
+}
 
 class SiLU(nn.Module):
     def __init__(self):
@@ -65,7 +59,10 @@ def __init__(self,
             groups=groups,
             bias=bias)
         self.bn = nn.BatchNorm2d(out_channels)
-        self.act = get_activation(act)  # silu
+        if act is not None:
+            self.act = activation_table.get(act)
+        else:
+            self.act = nn.Identity()
 
     def forward(self, x):
         x = self.bn(self.conv(x))
@@ -1043,7 +1040,7 @@ def build_block(num_repeat, in_channels, mid_channels, out_channels):
                     mid_channels=mid_channels,
                     out_channels=out_channels,
                     stride=1)
-            block_list.add_sublayer(str(i), block)
+            block_list.add_module(str(i), block)
         return block_list
 
     @property

ppdettorch/modeling/heads/yolov6_head.py

@@ -1058,10 +1058,10 @@ def __init__(
         self.proj_conv = nn.Conv2d(self.reg_max + 1, 1, 1, bias=False)
         self.proj_conv.skip_quant = True
 
-        self.proj = torch.linspace(0, self.reg_max, self.reg_max + 1)
-        self.proj_conv.weight.set_value(
-            self.proj.reshape([1, self.reg_max + 1, 1, 1]))
-        self.proj_conv.weight.stop_gradient = True
+        # self.proj = torch.linspace(0, self.reg_max, self.reg_max + 1)
+        # self.proj_conv.weight.set_value(
+        #     self.proj.reshape([1, self.reg_max + 1, 1, 1]))
+        # self.proj_conv.weight.stop_gradient = True
         self.print_l1_loss = print_l1_loss
         self._initialize_biases()
 

tests/process/infer/run_detection_infer.py

@@ -160,11 +160,15 @@ def run_picodet_coco(self, config_name=None):
         # config_name = "ppyoloe_convnext_tiny_36e_coco.yml"
 
         # # yolov6
-        config_name = "yolov6_n_300e_coco.yml"
+        # config_name = "yolov6_n_300e_coco.yml"
         # config_name = "yolov6_s_300e_coco.yml"
         # config_name = "yolov6_m_300e_coco.yml"
         config_name = "yolov6_l_300e_coco.yml"
 
+        # config_name = "yolov6lite/yolov6lite_s_400e_coco.yml"
+        # config_name = "yolov6lite/yolov6lite_m_400e_coco.yml"
+        # config_name = "yolov6lite/yolov6lite_l_400e_coco.yml"
+
         # # yolov7
         # config_name = "yolov7_l_300e_coco.yml"
         #
@@ -215,6 +219,8 @@ def run_picodet_coco(self, config_name=None):
             model_class = "ssd"
         elif "blazeface_" in config_name:
             model_class = "face_detection"
+        elif "yolov6lite_" in config_name:
+            model_class = "yolov6"
         else:
             config_name_end_index = FileUtils.get_file_name(config_name).find("_")
             model_class = config_name[:config_name_end_index]