From 287af3d11397c3fe116e65a6efafe5848f8e75b6 Mon Sep 17 00:00:00 2001 From: Kaipeng Deng Date: Thu, 18 Mar 2021 09:06:29 +0800 Subject: [PATCH] remove load_static_weights & polish ppdet.engine log (#2366) * remove load_static_weights --- .../_base_/cascade_mask_rcnn_r50_fpn.yml | 3 +-- .../_base_/cascade_rcnn_r50_fpn.yml | 3 +-- .../faster_rcnn/_base_/faster_rcnn_r50.yml | 3 +-- .../_base_/faster_rcnn_r50_fpn.yml | 3 +-- dygraph/configs/fcos/_base_/fcos_r50_fpn.yml | 3 +-- .../hrnet/_base_/faster_rcnn_hrnetv2p_w18.yml | 3 +-- .../mask_rcnn/_base_/mask_rcnn_r50.yml | 3 +-- .../mask_rcnn/_base_/mask_rcnn_r50_fpn.yml | 3 +-- .../ppyolo/_base_/ppyolo_mbv3_large.yml | 3 +-- .../ppyolo/_base_/ppyolo_mbv3_small.yml | 3 +-- .../configs/ppyolo/_base_/ppyolo_r18vd.yml | 3 +-- .../ppyolo/_base_/ppyolo_r50vd_dcn.yml | 3 +-- .../configs/slim/prune/yolov3_prune_fpgm.yml | 1 - .../slim/prune/yolov3_prune_l1_norm.yml | 1 - .../slim/quant/yolov3_mobilenet_v1_qat.yml | 1 - .../slim/quant/yolov3_mobilenet_v3_qat.yml | 1 - .../configs/solov2/_base_/solov2_r50_fpn.yml | 3 +-- .../ssd/_base_/ssd_mobilenet_v1_300.yml | 3 +-- .../ssd/_base_/ssdlite_mobilenet_v1_300.yml | 3 +-- .../_base_/ssdlite_mobilenet_v3_large_320.yml | 3 +-- .../_base_/ssdlite_mobilenet_v3_small_320.yml | 3 +-- .../ttfnet/_base_/ttfnet_darknet53.yml | 3 +-- .../yolov3/_base_/yolov3_darknet53.yml | 3 +-- .../yolov3/_base_/yolov3_mobilenet_v1.yml | 3 +-- .../_base_/yolov3_mobilenet_v3_large.yml | 3 +-- .../_base_/yolov3_mobilenet_v3_small.yml | 3 +-- .../yolov3/_base_/yolov3_r50vd_dcn.yml | 3 +-- .../yolov3/yolov3_mobilenet_v1_roadsign.yml | 1 - dygraph/ppdet/engine/callbacks.py | 26 +++++++++---------- dygraph/ppdet/engine/export_utils.py | 2 +- dygraph/ppdet/engine/trainer.py | 8 +++--- dygraph/ppdet/utils/checkpoint.py | 22 +--------------- 32 files changed, 41 insertions(+), 91 deletions(-) diff --git a/dygraph/configs/cascade_rcnn/_base_/cascade_mask_rcnn_r50_fpn.yml b/dygraph/configs/cascade_rcnn/_base_/cascade_mask_rcnn_r50_fpn.yml index 460b88c2c..8fef452e8 100644 --- a/dygraph/configs/cascade_rcnn/_base_/cascade_mask_rcnn_r50_fpn.yml +++ b/dygraph/configs/cascade_rcnn/_base_/cascade_mask_rcnn_r50_fpn.yml @@ -1,6 +1,5 @@ architecture: CascadeRCNN -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_cos_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_cos_pretrained.pdparams CascadeRCNN: diff --git a/dygraph/configs/cascade_rcnn/_base_/cascade_rcnn_r50_fpn.yml b/dygraph/configs/cascade_rcnn/_base_/cascade_rcnn_r50_fpn.yml index 245483153..51905687e 100644 --- a/dygraph/configs/cascade_rcnn/_base_/cascade_rcnn_r50_fpn.yml +++ b/dygraph/configs/cascade_rcnn/_base_/cascade_rcnn_r50_fpn.yml @@ -1,6 +1,5 @@ architecture: CascadeRCNN -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_cos_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_cos_pretrained.pdparams CascadeRCNN: diff --git a/dygraph/configs/faster_rcnn/_base_/faster_rcnn_r50.yml b/dygraph/configs/faster_rcnn/_base_/faster_rcnn_r50.yml index 43a9dba90..fd29f5ea1 100644 --- a/dygraph/configs/faster_rcnn/_base_/faster_rcnn_r50.yml +++ b/dygraph/configs/faster_rcnn/_base_/faster_rcnn_r50.yml @@ -1,6 +1,5 @@ architecture: FasterRCNN -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_cos_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_cos_pretrained.pdparams FasterRCNN: backbone: ResNet diff --git a/dygraph/configs/faster_rcnn/_base_/faster_rcnn_r50_fpn.yml b/dygraph/configs/faster_rcnn/_base_/faster_rcnn_r50_fpn.yml index 62b5704b3..aa5f5b288 100644 --- a/dygraph/configs/faster_rcnn/_base_/faster_rcnn_r50_fpn.yml +++ b/dygraph/configs/faster_rcnn/_base_/faster_rcnn_r50_fpn.yml @@ -1,6 +1,5 @@ architecture: FasterRCNN -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_cos_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_cos_pretrained.pdparams FasterRCNN: backbone: ResNet diff --git a/dygraph/configs/fcos/_base_/fcos_r50_fpn.yml b/dygraph/configs/fcos/_base_/fcos_r50_fpn.yml index fd8904cb0..1124082ee 100644 --- a/dygraph/configs/fcos/_base_/fcos_r50_fpn.yml +++ b/dygraph/configs/fcos/_base_/fcos_r50_fpn.yml @@ -1,6 +1,5 @@ architecture: FCOS -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_cos_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_cos_pretrained.pdparams FCOS: backbone: ResNet diff --git a/dygraph/configs/hrnet/_base_/faster_rcnn_hrnetv2p_w18.yml b/dygraph/configs/hrnet/_base_/faster_rcnn_hrnetv2p_w18.yml index cc6cec5b0..cf6645d1e 100644 --- a/dygraph/configs/hrnet/_base_/faster_rcnn_hrnetv2p_w18.yml +++ b/dygraph/configs/hrnet/_base_/faster_rcnn_hrnetv2p_w18.yml @@ -1,6 +1,5 @@ architecture: FasterRCNN -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/HRNet_W18_C_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/HRNet_W18_C_pretrained.pdparams FasterRCNN: backbone: HRNet diff --git a/dygraph/configs/mask_rcnn/_base_/mask_rcnn_r50.yml b/dygraph/configs/mask_rcnn/_base_/mask_rcnn_r50.yml index fc2694a06..aa6e0db56 100644 --- a/dygraph/configs/mask_rcnn/_base_/mask_rcnn_r50.yml +++ b/dygraph/configs/mask_rcnn/_base_/mask_rcnn_r50.yml @@ -1,6 +1,5 @@ architecture: MaskRCNN -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_cos_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_cos_pretrained.pdparams MaskRCNN: backbone: ResNet diff --git a/dygraph/configs/mask_rcnn/_base_/mask_rcnn_r50_fpn.yml b/dygraph/configs/mask_rcnn/_base_/mask_rcnn_r50_fpn.yml index e0ee9355f..74004b281 100644 --- a/dygraph/configs/mask_rcnn/_base_/mask_rcnn_r50_fpn.yml +++ b/dygraph/configs/mask_rcnn/_base_/mask_rcnn_r50_fpn.yml @@ -1,6 +1,5 @@ architecture: MaskRCNN -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_cos_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_cos_pretrained.pdparams MaskRCNN: backbone: ResNet diff --git a/dygraph/configs/ppyolo/_base_/ppyolo_mbv3_large.yml b/dygraph/configs/ppyolo/_base_/ppyolo_mbv3_large.yml index 65ff63bbc..dc84ae75c 100644 --- a/dygraph/configs/ppyolo/_base_/ppyolo_mbv3_large.yml +++ b/dygraph/configs/ppyolo/_base_/ppyolo_mbv3_large.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/MobileNetV3_large_x1_0_ssld_pretrained.tar -load_static_weights: true +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/MobileNetV3_large_x1_0_ssld_pretrained.pdparams norm_type: sync_bn use_ema: true ema_decay: 0.9998 diff --git a/dygraph/configs/ppyolo/_base_/ppyolo_mbv3_small.yml b/dygraph/configs/ppyolo/_base_/ppyolo_mbv3_small.yml index 76eb5b5bb..7e3a30c9a 100644 --- a/dygraph/configs/ppyolo/_base_/ppyolo_mbv3_small.yml +++ b/dygraph/configs/ppyolo/_base_/ppyolo_mbv3_small.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/MobileNetV3_small_x1_0_ssld_pretrained.tar -load_static_weights: true +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/MobileNetV3_small_x1_0_ssld_pretrained.pdparams norm_type: sync_bn use_ema: true ema_decay: 0.9998 diff --git a/dygraph/configs/ppyolo/_base_/ppyolo_r18vd.yml b/dygraph/configs/ppyolo/_base_/ppyolo_r18vd.yml index e1caea788..4b9e924be 100644 --- a/dygraph/configs/ppyolo/_base_/ppyolo_r18vd.yml +++ b/dygraph/configs/ppyolo/_base_/ppyolo_r18vd.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet18_vd_pretrained.tar -load_static_weights: true +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet18_vd_pretrained.pdparams norm_type: sync_bn use_ema: true ema_decay: 0.9998 diff --git a/dygraph/configs/ppyolo/_base_/ppyolo_r50vd_dcn.yml b/dygraph/configs/ppyolo/_base_/ppyolo_r50vd_dcn.yml index 2afcf8053..22cad9523 100644 --- a/dygraph/configs/ppyolo/_base_/ppyolo_r50vd_dcn.yml +++ b/dygraph/configs/ppyolo/_base_/ppyolo_r50vd_dcn.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_ssld_pretrained.tar -load_static_weights: true +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_ssld_pretrained.pdparams norm_type: sync_bn use_ema: true ema_decay: 0.9998 diff --git a/dygraph/configs/slim/prune/yolov3_prune_fpgm.yml b/dygraph/configs/slim/prune/yolov3_prune_fpgm.yml index 38b15f683..a1c72fde6 100644 --- a/dygraph/configs/slim/prune/yolov3_prune_fpgm.yml +++ b/dygraph/configs/slim/prune/yolov3_prune_fpgm.yml @@ -1,6 +1,5 @@ # Weights of yolov3_mobilenet_v1_voc pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v1_270e_voc.pdparams -load_static_weights: False weight_type: resume slim: Pruner diff --git a/dygraph/configs/slim/prune/yolov3_prune_l1_norm.yml b/dygraph/configs/slim/prune/yolov3_prune_l1_norm.yml index 2f1c76d92..313ee541d 100644 --- a/dygraph/configs/slim/prune/yolov3_prune_l1_norm.yml +++ b/dygraph/configs/slim/prune/yolov3_prune_l1_norm.yml @@ -1,6 +1,5 @@ # Weights of yolov3_mobilenet_v1_voc pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v1_270e_voc.pdparams -load_static_weights: False weight_type: resume slim: Pruner diff --git a/dygraph/configs/slim/quant/yolov3_mobilenet_v1_qat.yml b/dygraph/configs/slim/quant/yolov3_mobilenet_v1_qat.yml index 25cfc3706..f168f40ea 100644 --- a/dygraph/configs/slim/quant/yolov3_mobilenet_v1_qat.yml +++ b/dygraph/configs/slim/quant/yolov3_mobilenet_v1_qat.yml @@ -1,6 +1,5 @@ # Weights of yolov3_mobilenet_v1_coco pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v1_270e_coco.pdparams -load_static_weights: False weight_type: resume slim: QAT diff --git a/dygraph/configs/slim/quant/yolov3_mobilenet_v3_qat.yml b/dygraph/configs/slim/quant/yolov3_mobilenet_v3_qat.yml index 5ea8fc7aa..34a074498 100644 --- a/dygraph/configs/slim/quant/yolov3_mobilenet_v3_qat.yml +++ b/dygraph/configs/slim/quant/yolov3_mobilenet_v3_qat.yml @@ -1,6 +1,5 @@ # Weights of yolov3_mobilenet_v3_coco pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v3_large_270e_coco.pdparams -load_static_weights: False weight_type: resume slim: QAT diff --git a/dygraph/configs/solov2/_base_/solov2_r50_fpn.yml b/dygraph/configs/solov2/_base_/solov2_r50_fpn.yml index 92ebe213e..53ec3b288 100644 --- a/dygraph/configs/solov2/_base_/solov2_r50_fpn.yml +++ b/dygraph/configs/solov2/_base_/solov2_r50_fpn.yml @@ -1,6 +1,5 @@ architecture: SOLOv2 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_cos_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_cos_pretrained.pdparams SOLOv2: backbone: ResNet diff --git a/dygraph/configs/ssd/_base_/ssd_mobilenet_v1_300.yml b/dygraph/configs/ssd/_base_/ssd_mobilenet_v1_300.yml index 1eb9f68ef..b8fe6946e 100644 --- a/dygraph/configs/ssd/_base_/ssd_mobilenet_v1_300.yml +++ b/dygraph/configs/ssd/_base_/ssd_mobilenet_v1_300.yml @@ -1,6 +1,5 @@ architecture: SSD -pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/ssd_mobilenet_v1_coco_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ssd_mobilenet_v1_coco_pretrained.pdparams SSD: backbone: MobileNet diff --git a/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v1_300.yml b/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v1_300.yml index 2e5a47485..db811ade9 100644 --- a/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v1_300.yml +++ b/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v1_300.yml @@ -1,6 +1,5 @@ architecture: SSD -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/MobileNetV1_ssld_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/MobileNetV1_ssld_pretrained.pdparams SSD: backbone: MobileNet diff --git a/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v3_large_320.yml b/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v3_large_320.yml index a3586ee2f..cc6e3284a 100644 --- a/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v3_large_320.yml +++ b/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v3_large_320.yml @@ -1,6 +1,5 @@ architecture: SSD -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/MobileNetV3_large_x1_0_ssld_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/MobileNetV3_large_x1_0_ssld_pretrained.pdparams SSD: backbone: MobileNetV3 diff --git a/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v3_small_320.yml b/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v3_small_320.yml index 6169d9759..887f95fa2 100644 --- a/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v3_small_320.yml +++ b/dygraph/configs/ssd/_base_/ssdlite_mobilenet_v3_small_320.yml @@ -1,6 +1,5 @@ architecture: SSD -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/MobileNetV3_small_x1_0_ssld_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/MobileNetV3_small_x1_0_ssld_pretrained.pdparams SSD: backbone: MobileNetV3 diff --git a/dygraph/configs/ttfnet/_base_/ttfnet_darknet53.yml b/dygraph/configs/ttfnet/_base_/ttfnet_darknet53.yml index d175cadb2..90b0c3361 100644 --- a/dygraph/configs/ttfnet/_base_/ttfnet_darknet53.yml +++ b/dygraph/configs/ttfnet/_base_/ttfnet_darknet53.yml @@ -1,6 +1,5 @@ architecture: TTFNet -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/DarkNet53_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/DarkNet53_pretrained.pdparams TTFNet: backbone: DarkNet diff --git a/dygraph/configs/yolov3/_base_/yolov3_darknet53.yml b/dygraph/configs/yolov3/_base_/yolov3_darknet53.yml index ec1200e69..1187f6eac 100644 --- a/dygraph/configs/yolov3/_base_/yolov3_darknet53.yml +++ b/dygraph/configs/yolov3/_base_/yolov3_darknet53.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/DarkNet53_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/DarkNet53_pretrained.pdparams norm_type: sync_bn YOLOv3: diff --git a/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v1.yml b/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v1.yml index e82d15560..6452b5132 100644 --- a/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v1.yml +++ b/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v1.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/MobileNetV1_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/MobileNetV1_pretrained.pdparams norm_type: sync_bn YOLOv3: diff --git a/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v3_large.yml b/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v3_large.yml index 8c299f373..94b5dea3e 100644 --- a/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v3_large.yml +++ b/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v3_large.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/MobileNetV3_large_x1_0_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/MobileNetV3_large_x1_0_ssld_pretrained.pdparams norm_type: sync_bn YOLOv3: diff --git a/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v3_small.yml b/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v3_small.yml index 8ddf2965c..f0f144b91 100644 --- a/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v3_small.yml +++ b/dygraph/configs/yolov3/_base_/yolov3_mobilenet_v3_small.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/MobileNetV3_small_x1_0_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/MobileNetV3_small_x1_0_ssld_pretrained.pdparams norm_type: sync_bn YOLOv3: diff --git a/dygraph/configs/yolov3/_base_/yolov3_r50vd_dcn.yml b/dygraph/configs/yolov3/_base_/yolov3_r50vd_dcn.yml index 1c4e0dc68..0d01148b4 100644 --- a/dygraph/configs/yolov3/_base_/yolov3_r50vd_dcn.yml +++ b/dygraph/configs/yolov3/_base_/yolov3_r50vd_dcn.yml @@ -1,6 +1,5 @@ architecture: YOLOv3 -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_ssld_pretrained.tar -load_static_weights: True +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_ssld_pretrained.pdparams norm_type: sync_bn YOLOv3: diff --git a/dygraph/configs/yolov3/yolov3_mobilenet_v1_roadsign.yml b/dygraph/configs/yolov3/yolov3_mobilenet_v1_roadsign.yml index f5048c2f7..36936e197 100644 --- a/dygraph/configs/yolov3/yolov3_mobilenet_v1_roadsign.yml +++ b/dygraph/configs/yolov3/yolov3_mobilenet_v1_roadsign.yml @@ -5,7 +5,6 @@ _BASE_: [ '_base_/yolov3_reader.yml', ] pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v1_270e_coco.pdparams -load_static_weights: false norm_type: sync_bn weights: output/yolov3_mobilenet_v1_roadsign/model_final metric: VOC diff --git a/dygraph/ppdet/engine/callbacks.py b/dygraph/ppdet/engine/callbacks.py index 6c973d8b4..1419661ca 100644 --- a/dygraph/ppdet/engine/callbacks.py +++ b/dygraph/ppdet/engine/callbacks.py @@ -29,7 +29,7 @@ from ppdet.utils.checkpoint import save_model from ppdet.optimizer import ModelEMA from ppdet.utils.logger import setup_logger -logger = setup_logger(__name__) +logger = setup_logger('ppdet.engine') __all__ = ['Callback', 'ComposeCallback', 'LogPrinter', 'Checkpointer'] @@ -53,27 +53,27 @@ class Callback(object): class ComposeCallback(object): def __init__(self, callbacks): - callbacks = [h for h in list(callbacks) if h is not None] - for h in callbacks: - assert isinstance(h, - Callback), "hook shoule be subclass of Callback" + callbacks = [c for c in list(callbacks) if c is not None] + for c in callbacks: + assert isinstance( + c, Callback), "callback should be subclass of Callback" self._callbacks = callbacks def on_step_begin(self, status): - for h in self._callbacks: - h.on_step_begin(status) + for c in self._callbacks: + c.on_step_begin(status) def on_step_end(self, status): - for h in self._callbacks: - h.on_step_end(status) + for c in self._callbacks: + c.on_step_end(status) def on_epoch_begin(self, status): - for h in self._callbacks: - h.on_epoch_begin(status) + for c in self._callbacks: + c.on_epoch_begin(status) def on_epoch_end(self, status): - for h in self._callbacks: - h.on_epoch_end(status) + for c in self._callbacks: + c.on_epoch_end(status) class LogPrinter(Callback): diff --git a/dygraph/ppdet/engine/export_utils.py b/dygraph/ppdet/engine/export_utils.py index cfca44489..7fa2403d5 100644 --- a/dygraph/ppdet/engine/export_utils.py +++ b/dygraph/ppdet/engine/export_utils.py @@ -23,7 +23,7 @@ from collections import OrderedDict from ppdet.metrics import get_categories from ppdet.utils.logger import setup_logger -logger = setup_logger(__name__) +logger = setup_logger('ppdet.engine') # Global dictionary TRT_MIN_SUBGRAPH = { diff --git a/dygraph/ppdet/engine/trainer.py b/dygraph/ppdet/engine/trainer.py index ce4688ad7..5a944c8de 100644 --- a/dygraph/ppdet/engine/trainer.py +++ b/dygraph/ppdet/engine/trainer.py @@ -38,7 +38,7 @@ from .callbacks import Callback, ComposeCallback, LogPrinter, Checkpointer, Wife from .export_utils import _dump_infer_config from ppdet.utils.logger import setup_logger -logger = setup_logger(__name__) +logger = setup_logger('ppdet.engine') __all__ = ['Trainer'] @@ -157,7 +157,7 @@ class Trainer(object): metric.reset() def register_callbacks(self, callbacks): - callbacks = [h for h in list(callbacks) if h is not None] + callbacks = [c for c in list(callbacks) if c is not None] for c in callbacks: assert isinstance(c, Callback), \ "metrics shoule be instances of subclass of Metric" @@ -179,9 +179,7 @@ class Trainer(object): logger.debug("Resume weights of epoch {}".format(self.start_epoch)) else: self.start_epoch = 0 - load_pretrain_weight(self.model, weights, - self.cfg.get('load_static_weights', False), - weight_type) + load_pretrain_weight(self.model, weights, weight_type) logger.debug("Load {} weights {} to start training".format( weight_type, weights)) diff --git a/dygraph/ppdet/utils/checkpoint.py b/dygraph/ppdet/utils/checkpoint.py index a0501c972..193f415ad 100644 --- a/dygraph/ppdet/utils/checkpoint.py +++ b/dygraph/ppdet/utils/checkpoint.py @@ -142,10 +142,7 @@ def load_weight(model, weight, optimizer=None): return last_epoch -def load_pretrain_weight(model, - pretrain_weight, - load_static_weights=False, - weight_type='pretrain'): +def load_pretrain_weight(model, pretrain_weight, weight_type='pretrain'): assert weight_type in ['pretrain', 'finetune'] if is_url(pretrain_weight): @@ -161,23 +158,6 @@ def load_pretrain_weight(model, model_dict = model.state_dict() - if load_static_weights: - pre_state_dict = paddle.static.load_program_state(path) - param_state_dict = {} - for key in model_dict.keys(): - weight_name = model_dict[key].name - if weight_name in pre_state_dict.keys(): - logger.info('Load weight: {}, shape: {}'.format( - weight_name, pre_state_dict[weight_name].shape)) - param_state_dict[key] = pre_state_dict[weight_name] - else: - if 'backbone' in key: - logger.info('Lack weight: {}, structure name: {}'.format( - weight_name, key)) - param_state_dict[key] = model_dict[key] - model.set_dict(param_state_dict) - return - param_state_dict = paddle.load(path + '.pdparams') if weight_type == 'pretrain': model.backbone.set_dict(param_state_dict) -- GitLab