Merge branch 'PaddlePaddle:develop' into develop

ppcls/arch/backbone/legendary_models/resnet.py

@@ -319,7 +319,7 @@ class ResNet(TheseusLayer):
             [[input_image_channel, 32, 3, 2], [32, 32, 3, 1], [32, 64, 3, 1]]
         }
 
-        self.stem = nn.Sequential(* [
+        self.stem = nn.Sequential(*[
             ConvBNLayer(
                 num_channels=in_c,
                 num_filters=out_c,
@@ -385,7 +385,10 @@ def _load_pretrained(pretrained, model, model_url, use_ssld):
     elif pretrained is True:
         load_dygraph_pretrain_from_url(model, model_url, use_ssld=use_ssld)
     elif isinstance(pretrained, str):
-        load_dygraph_pretrain(model, pretrained)
+        if 'http' in pretrained:
+            load_dygraph_pretrain_from_url(model, pretrained, use_ssld=False)
+        else:
+            load_dygraph_pretrain(model, pretrained)
     else:
         raise RuntimeError(
             "pretrained type is not available. Please use `string` or `boolean` type."

ppcls/configs/reid/strong_baseline/baseline.yaml

@@ -24,7 +24,7 @@ Arch:
   infer_add_softmax: False
   Backbone:
     name: "ResNet50"
-    pretrained: True
+    pretrained: https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/others/resnet50-19c8e357_torch2paddle.pdparams
     stem_act: null
   BackboneStopLayer:
     name: "flatten"

ppcls/configs/reid/strong_baseline/softmax_triplet.yaml

@@ -24,7 +24,7 @@ Arch:
   infer_add_softmax: False
   Backbone:
     name: "ResNet50_last_stage_stride1"
-    pretrained: True
+    pretrained: https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/others/resnet50-19c8e357_torch2paddle.pdparams
     stem_act: null
   BackboneStopLayer:
     name: "flatten"

ppcls/configs/reid/strong_baseline/softmax_triplet_with_center.yaml

@@ -24,7 +24,7 @@ Arch:
   infer_add_softmax: False
   Backbone:
     name: "ResNet50_last_stage_stride1"
-    pretrained: True
+    pretrained: https://paddle-imagenet-models-name.bj.bcebos.com/dygraph/others/resnet50-19c8e357_torch2paddle.pdparams
     stem_act: null
   BackboneStopLayer:
     name: "flatten"