Merge pull request #1610 from TingquanGao/dev/fix_theseus

fix: upgrade replace_sub() to upgrade_sublayer()

Author: Intsigstephon

ppcls/arch/backbone/variant_models/pp_lcnet_variant.py

@@ -19,11 +19,11 @@ def forward(self, input, res_dict=None, **kwargs):
 
 
 def PPLCNet_x2_5_Tanh(pretrained=False, use_ssld=False, **kwargs):
-    def replace_function(origin_layer):
+    def replace_function(origin_layer, pattern):
         new_layer = TanhSuffix(origin_layer)
         return new_layer
 
-    match_re = "linear_0"
+    pattern = "fc"
     model = PPLCNet_x2_5(pretrained=pretrained, use_ssld=use_ssld, **kwargs)
-    model.replace_sub(match_re, replace_function, True)
+    model.upgrade_sublayer(pattern, replace_function)
     return model

ppcls/configs/Vehicle/PPLCNet_2.5x_ReID.yaml

@@ -27,7 +27,7 @@ Arch:
     pretrained: True
     use_ssld: True
   BackboneStopLayer:
-    name: "flatten_0"
+    name: "flatten"
   Neck:
     name: "FC"
     embedding_size: 1280

ppcls/configs/quick_start/MobileNetV1_retrieval.yaml

@@ -25,7 +25,7 @@ Arch:
     name: MobileNetV1
     pretrained: False
   BackboneStopLayer:
-    name: flatten_0
+    name: "flatten"
   Neck:
     name: FC
     embedding_size: 1024

ppcls/configs/slim/GeneralRecognition_PPLCNet_x2_5_quantization.yaml

@@ -34,7 +34,7 @@ Arch:
     pretrained: False
     use_ssld: True
   BackboneStopLayer:
-    name: flatten_0
+    name: "flatten"
   Neck:
     name: FC
     embedding_size: 1280

ppcls/configs/slim/ResNet50_vehicle_reid_prune.yaml

@@ -31,7 +31,7 @@ Arch:
     name: "ResNet50_last_stage_stride1"
     pretrained: True
   BackboneStopLayer:
-    name: "adaptive_avg_pool2d_0"
+    name: "avg_pool"
   Neck:
     name: "VehicleNeck"
     in_channels: 2048

ppcls/configs/slim/ResNet50_vehicle_reid_quantization.yaml

@@ -30,7 +30,7 @@ Arch:
     name: "ResNet50_last_stage_stride1"
     pretrained: True
   BackboneStopLayer:
-    name: "adaptive_avg_pool2d_0"
+    name: "avg_pool"
   Neck:
     name: "VehicleNeck"
     in_channels: 2048