diff --git a/dygraph/configs/dcn/cascade_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml b/dygraph/configs/dcn/cascade_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml index 9476db8d6ddda3af16b7182e7fc9b65cbdfbf536..19c5ad811b1d0369f7a56ee74986780671061c03 100644 --- a/dygraph/configs/dcn/cascade_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml +++ b/dygraph/configs/dcn/cascade_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'cascade_rcnn_dcn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNeXt101_vd_64x4d_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNeXt101_vd_64x4d_pretrained.pdparams weights: output/cascade_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/dcn/faster_rcnn_dcn_r101_vd_fpn_1x_coco.yml b/dygraph/configs/dcn/faster_rcnn_dcn_r101_vd_fpn_1x_coco.yml index 1a69fc7f41c9eac37be38a508efede2e231c3d74..274c1710bb11612798c8368e3edd048b4fddad97 100644 --- a/dygraph/configs/dcn/faster_rcnn_dcn_r101_vd_fpn_1x_coco.yml +++ b/dygraph/configs/dcn/faster_rcnn_dcn_r101_vd_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_dcn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_vd_pretrained.pdparams weights: output/faster_rcnn_dcn_r101_vd_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/dcn/faster_rcnn_dcn_r50_vd_fpn_1x_coco.yml b/dygraph/configs/dcn/faster_rcnn_dcn_r50_vd_fpn_1x_coco.yml index 4290f566b08721ca9a8daf08d76e34484afe4fa2..735edbbd1e8160467761eb1e79406ac4ed89de9b 100644 --- a/dygraph/configs/dcn/faster_rcnn_dcn_r50_vd_fpn_1x_coco.yml +++ b/dygraph/configs/dcn/faster_rcnn_dcn_r50_vd_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_dcn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_pretrained.pdparams weights: output/faster_rcnn_dcn_r50_vd_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/dcn/faster_rcnn_dcn_r50_vd_fpn_2x_coco.yml b/dygraph/configs/dcn/faster_rcnn_dcn_r50_vd_fpn_2x_coco.yml index b49ce95bbced26a258582ea5eeba09556c7ea520..685d9671068e76139da5212e3059403626843ccc 100644 --- a/dygraph/configs/dcn/faster_rcnn_dcn_r50_vd_fpn_2x_coco.yml +++ b/dygraph/configs/dcn/faster_rcnn_dcn_r50_vd_fpn_2x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_dcn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_pretrained.pdparams weights: output/faster_rcnn_dcn_r50_vd_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/dcn/faster_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml b/dygraph/configs/dcn/faster_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml index e826d6afe02c46025a068928d7bf262d4770e9f6..2b09c7e15c01813dfdaeacc08b56ff03c807b1dc 100644 --- a/dygraph/configs/dcn/faster_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml +++ b/dygraph/configs/dcn/faster_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_dcn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNeXt101_vd_64x4d_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNeXt101_vd_64x4d_pretrained.pdparams weights: output/faster_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/dcn/mask_rcnn_dcn_r101_vd_fpn_1x_coco.yml b/dygraph/configs/dcn/mask_rcnn_dcn_r101_vd_fpn_1x_coco.yml index 6413ccc53ddc017373c42f0d0276f2acae398ccb..930bd89875e360374aed7a970989878cc63c34c0 100644 --- a/dygraph/configs/dcn/mask_rcnn_dcn_r101_vd_fpn_1x_coco.yml +++ b/dygraph/configs/dcn/mask_rcnn_dcn_r101_vd_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'mask_rcnn_dcn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_vd_pretrained.pdparams weights: output/mask_rcnn_dcn_r101_vd_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/dcn/mask_rcnn_dcn_r50_vd_fpn_2x_coco.yml b/dygraph/configs/dcn/mask_rcnn_dcn_r50_vd_fpn_2x_coco.yml index 4793dfd06b3c2e93fb4130b3f227d437d834ec35..d36b5f56f0c790b9eb6aa7e9f7778057a66fc1be 100644 --- a/dygraph/configs/dcn/mask_rcnn_dcn_r50_vd_fpn_2x_coco.yml +++ b/dygraph/configs/dcn/mask_rcnn_dcn_r50_vd_fpn_2x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'mask_rcnn_dcn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_pretrained.pdparams weights: output/mask_rcnn_dcn_r50_vd_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/dcn/mask_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml b/dygraph/configs/dcn/mask_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml index 72335c3c28ca1f772c900cfddcc77afbb2647b2d..933e21f3fae41ed6978256c7e786bb9426696ae7 100644 --- a/dygraph/configs/dcn/mask_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml +++ b/dygraph/configs/dcn/mask_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'mask_rcnn_dcn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNeXt101_vd_64x4d_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNeXt101_vd_64x4d_pretrained.pdparams weights: output/mask_rcnn_dcn_x101_vd_64x4d_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r101_1x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r101_1x_coco.yml index 93c3deace5a34bd7f556e100d851d397c5c9b585..8876426fb6d6d4f5b89c39e050f1331520d02656 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r101_1x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r101_1x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'faster_rcnn_r50_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_pretrained.pdparams weights: output/faster_rcnn_r101_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r101_fpn_1x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r101_fpn_1x_coco.yml index 94166c695fcad85393c9233645c7e48dbcd59f17..a2e5ee527b60e95b121959492dba1855337467c9 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r101_fpn_1x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r101_fpn_1x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_pretrained.pdparams weights: output/faster_rcnn_r101_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r101_fpn_2x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r101_fpn_2x_coco.yml index 540f1fe6a176f0d1508fe0e72d33bc3d634a6cac..0a07dec75890977c9d717cce4a704dad59cec237 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r101_fpn_2x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r101_fpn_2x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_pretrained.pdparams weights: output/faster_rcnn_r101_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r101_vd_fpn_1x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r101_vd_fpn_1x_coco.yml index 38f564cef1fda078df6dea13f85ffa947667bbb7..32e308b86ef9937601d29c9026dafd7650d86080 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r101_vd_fpn_1x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r101_vd_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_vd_pretrained.pdparams weights: output/faster_rcnn_r101_vd_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r101_vd_fpn_2x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r101_vd_fpn_2x_coco.yml index 8ac6aca88ea3580b30bed886a26bc498b733fa97..65b8226b9ec8f493fcdb6e82e5f6f9bba903cecf 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r101_vd_fpn_2x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r101_vd_fpn_2x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_vd_pretrained.pdparams weights: output/faster_rcnn_r101_vd_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r34_fpn_1x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r34_fpn_1x_coco.yml index b75bd40b31b9867f56310c3fcba05d9d31169748..f1083528578c8ea681f4a550c6726fad31214d16 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r34_fpn_1x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r34_fpn_1x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet34_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet34_pretrained.pdparams weights: output/faster_rcnn_r34_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r34_vd_fpn_1x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r34_vd_fpn_1x_coco.yml index c8ae2a681e0476d3794addff5d32d69fcd964f2d..5cf576b6384ec25bb92fd40705cac8b6196ca793 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r34_vd_fpn_1x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r34_vd_fpn_1x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet34_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet34_vd_pretrained.pdparams weights: output/faster_rcnn_r34_vd_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_1x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_1x_coco.yml index f0a0d8216ec6cd3b92bcf3064c3e36c938a58dc5..ac0e720499ad204ad3a09785ac30ac6e6b1ef21c 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_1x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_r50_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_pretrained.pdparams weights: output/faster_rcnn_r50_vd_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_fpn_1x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_fpn_1x_coco.yml index bbbf44c53c2e0c674296aa2975a8af439d1d6ece..6bf9d7101ee9a89b2c480e04bb3279d608c2f9e3 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_fpn_1x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_pretrained.pdparams weights: output/faster_rcnn_r50_vd_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_fpn_2x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_fpn_2x_coco.yml index 34f496e3f9c6e5addf8171f5e28d790dcd770a85..7fc3a883574a6694b5379b21a38be7de354ee6df 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_fpn_2x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_r50_vd_fpn_2x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_pretrained.pdparams weights: output/faster_rcnn_r50_vd_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_x101_vd_64x4d_fpn_1x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_x101_vd_64x4d_fpn_1x_coco.yml index 68c2c4e8a422c5866c2db2264429031aa8fa233b..20e38b762144c6f9515cbb52abf676fa4415713e 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_x101_vd_64x4d_fpn_1x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_x101_vd_64x4d_fpn_1x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNeXt101_vd_64x4d_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNeXt101_vd_64x4d_pretrained.pdparams weights: output/faster_rcnn_x101_vd_64x4d_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/faster_rcnn/faster_rcnn_x101_vd_64x4d_fpn_2x_coco.yml b/dygraph/configs/faster_rcnn/faster_rcnn_x101_vd_64x4d_fpn_2x_coco.yml index b4831719f06b5f547cc76e9cf7d5d9d03db4c158..82e0b39f275a88754ab751bac10309b0f0b2948b 100644 --- a/dygraph/configs/faster_rcnn/faster_rcnn_x101_vd_64x4d_fpn_2x_coco.yml +++ b/dygraph/configs/faster_rcnn/faster_rcnn_x101_vd_64x4d_fpn_2x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'faster_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNeXt101_vd_64x4d_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNeXt101_vd_64x4d_pretrained.pdparams weights: output/faster_rcnn_x101_vd_64x4d_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/mask_rcnn/mask_rcnn_r101_fpn_1x_coco.yml b/dygraph/configs/mask_rcnn/mask_rcnn_r101_fpn_1x_coco.yml index 77f24e9d6616600e85f5c642843b2f090db365ed..aae703c194db64158587baf86d3e6aca60bd8923 100644 --- a/dygraph/configs/mask_rcnn/mask_rcnn_r101_fpn_1x_coco.yml +++ b/dygraph/configs/mask_rcnn/mask_rcnn_r101_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'mask_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_pretrained.pdparams weights: output/mask_rcnn_r101_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/mask_rcnn/mask_rcnn_r101_vd_fpn_1x_coco.yml b/dygraph/configs/mask_rcnn/mask_rcnn_r101_vd_fpn_1x_coco.yml index 2205f1a61ba18233a981aa9c3551924f49d2a135..58d7a7884d7886c39544ee56bf445590122d0acc 100644 --- a/dygraph/configs/mask_rcnn/mask_rcnn_r101_vd_fpn_1x_coco.yml +++ b/dygraph/configs/mask_rcnn/mask_rcnn_r101_vd_fpn_1x_coco.yml @@ -1,7 +1,7 @@ _BASE_: [ 'mask_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet101_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet101_vd_pretrained.pdparams weights: output/mask_rcnn_r101_vd_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/mask_rcnn/mask_rcnn_r50_vd_fpn_1x_coco.yml b/dygraph/configs/mask_rcnn/mask_rcnn_r50_vd_fpn_1x_coco.yml index dcf62134e92fa8a029eb12479822748d5ed9808d..d5387417b4bfac35a71b3edf8f062a751dcae3b3 100644 --- a/dygraph/configs/mask_rcnn/mask_rcnn_r50_vd_fpn_1x_coco.yml +++ b/dygraph/configs/mask_rcnn/mask_rcnn_r50_vd_fpn_1x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'mask_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_pretrained.pdparams weights: output/mask_rcnn_r50_vd_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/mask_rcnn/mask_rcnn_r50_vd_fpn_2x_coco.yml b/dygraph/configs/mask_rcnn/mask_rcnn_r50_vd_fpn_2x_coco.yml index 618fe5dc6e9d98e50548b2483de4268238fbbfc3..f85f0299cc2358ca08c548fd3c68eefd108f3d1f 100644 --- a/dygraph/configs/mask_rcnn/mask_rcnn_r50_vd_fpn_2x_coco.yml +++ b/dygraph/configs/mask_rcnn/mask_rcnn_r50_vd_fpn_2x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'mask_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNet50_vd_pretrained.pdparams weights: output/mask_rcnn_r50_vd_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_1x_coco.yml b/dygraph/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_1x_coco.yml index 9c83e259d37ae2973983ef16e40b0fb603555de3..c318e1d2a8885a6fae920b95efbb3971b271bccd 100644 --- a/dygraph/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_1x_coco.yml +++ b/dygraph/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_1x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'mask_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNeXt101_vd_64x4d_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNeXt101_vd_64x4d_pretrained.pdparams weights: output/mask_rcnn_x101_vd_64x4d_fpn_1x_coco/model_final ResNet: diff --git a/dygraph/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.yml b/dygraph/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.yml index 07c097e9a6e5dfd7000661d5ce820f63201de5a3..501c618a690e73f004cc04f9abd8f5dc2d493ff6 100644 --- a/dygraph/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.yml +++ b/dygraph/configs/mask_rcnn/mask_rcnn_x101_vd_64x4d_fpn_2x_coco.yml @@ -2,7 +2,7 @@ _BASE_: [ 'mask_rcnn_r50_fpn_1x_coco.yml', ] -pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNeXt101_vd_64x4d_pretrained.tar +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/ResNeXt101_vd_64x4d_pretrained.pdparams weights: output/mask_rcnn_x101_vd_64x4d_fpn_2x_coco/model_final ResNet: diff --git a/dygraph/configs/slim/prune/yolov3_prune_fpgm.yml b/dygraph/configs/slim/prune/yolov3_prune_fpgm.yml index a1c72fde697606868596142ce4a99025f8157a3e..ed9495a73e4fbacbe20bbeb3093f2a7a406ea9e6 100644 --- a/dygraph/configs/slim/prune/yolov3_prune_fpgm.yml +++ b/dygraph/configs/slim/prune/yolov3_prune_fpgm.yml @@ -1,5 +1,5 @@ # Weights of yolov3_mobilenet_v1_voc -pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v1_270e_voc.pdparams +pretrain_weights: https://paddledet.bj.bcebos.com/models/yolov3_mobilenet_v1_270e_voc.pdparams 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 313ee541d99f896926fffc47ca54f999c8bccb2d..db2a616daab7087e4b02c76c72df34c3a6a7937f 100644 --- a/dygraph/configs/slim/prune/yolov3_prune_l1_norm.yml +++ b/dygraph/configs/slim/prune/yolov3_prune_l1_norm.yml @@ -1,5 +1,5 @@ # Weights of yolov3_mobilenet_v1_voc -pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v1_270e_voc.pdparams +pretrain_weights: https://paddledet.bj.bcebos.com/models/yolov3_mobilenet_v1_270e_voc.pdparams 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 f168f40ea47b79d03771c006c6cf7619630763c3..dfa365c10f581499192fc043031087971e8a44f8 100644 --- a/dygraph/configs/slim/quant/yolov3_mobilenet_v1_qat.yml +++ b/dygraph/configs/slim/quant/yolov3_mobilenet_v1_qat.yml @@ -1,5 +1,5 @@ # Weights of yolov3_mobilenet_v1_coco -pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v1_270e_coco.pdparams +pretrain_weights: https://paddledet.bj.bcebos.com/models/yolov3_mobilenet_v1_270e_coco.pdparams 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 34a07449876c4f5815222be13dcf3fe4d5f48314..288e72a10ec05c9753c588eda26e474b2ffc8afa 100644 --- a/dygraph/configs/slim/quant/yolov3_mobilenet_v3_qat.yml +++ b/dygraph/configs/slim/quant/yolov3_mobilenet_v3_qat.yml @@ -1,5 +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 +pretrain_weights: https://paddledet.bj.bcebos.com/models/yolov3_mobilenet_v3_large_270e_coco.pdparams weight_type: resume slim: QAT diff --git a/dygraph/configs/ssd/_base_/ssd_vgg16_300.yml b/dygraph/configs/ssd/_base_/ssd_vgg16_300.yml index 3b9f039a5e2a99396ba0845c9f90e7b06fe3bf21..59821054d9ba3005f6e75b3da38255c1fba187f1 100644 --- a/dygraph/configs/ssd/_base_/ssd_vgg16_300.yml +++ b/dygraph/configs/ssd/_base_/ssd_vgg16_300.yml @@ -1,5 +1,5 @@ architecture: SSD -pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/VGG16_caffe_pretrained.pdparams +pretrain_weights: https://paddledet.bj.bcebos.com/models/pretrained/VGG16_caffe_pretrained.pdparams # Model Achitecture SSD: diff --git a/dygraph/configs/yolov3/yolov3_mobilenet_v1_roadsign.yml b/dygraph/configs/yolov3/yolov3_mobilenet_v1_roadsign.yml index 36936e1976f0d152150ff6c613a2f97b4c25d731..c79397ddd1004de0508b885aeb3913dbdda9cef3 100644 --- a/dygraph/configs/yolov3/yolov3_mobilenet_v1_roadsign.yml +++ b/dygraph/configs/yolov3/yolov3_mobilenet_v1_roadsign.yml @@ -4,7 +4,7 @@ _BASE_: [ '_base_/yolov3_mobilenet_v1.yml', '_base_/yolov3_reader.yml', ] -pretrain_weights: https://paddlemodels.bj.bcebos.com/object_detection/dygraph/yolov3_mobilenet_v1_270e_coco.pdparams +pretrain_weights: https://paddledet.bj.bcebos.com/models/yolov3_mobilenet_v1_270e_coco.pdparams norm_type: sync_bn weights: output/yolov3_mobilenet_v1_roadsign/model_final metric: VOC diff --git a/dygraph/ppdet/engine/trainer.py b/dygraph/ppdet/engine/trainer.py index 2d409805aae351ed780adfa2446b8161420b52e7..57c16e4b8c74fd2fa65ef2b086b42a7224188c60 100644 --- a/dygraph/ppdet/engine/trainer.py +++ b/dygraph/ppdet/engine/trainer.py @@ -58,7 +58,7 @@ class Trainer(object): # model slim build if 'slim' in cfg and cfg.slim: if self.mode == 'train': - self.load_weights(cfg.pretrain_weights, cfg.weight_type) + self.load_weights(cfg.pretrain_weights) self.slim = create(cfg.slim) self.slim(self.model) @@ -174,17 +174,14 @@ class Trainer(object): "metrics shoule be instances of subclass of Metric" self._metrics.extend(metrics) - def load_weights(self, weights, weight_type='pretrain'): - assert weight_type in ['pretrain', 'resume', 'finetune'], \ - "weight_type can only be 'pretrain', 'resume', 'finetune'" - if weight_type == 'resume': - self.start_epoch = load_weight(self.model, weights, self.optimizer) - logger.debug("Resume weights of epoch {}".format(self.start_epoch)) - else: - self.start_epoch = 0 - load_pretrain_weight(self.model, weights, weight_type) - logger.debug("Load {} weights {} to start training".format( - weight_type, weights)) + def load_weights(self, weights): + self.start_epoch = 0 + load_pretrain_weight(self.model, weights) + logger.debug("Load weights {} to start training".format(weights)) + + def resume_weights(self, weights): + self.start_epoch = load_weight(self.model, weights, self.optimizer) + logger.debug("Resume weights of epoch {}".format(self.start_epoch)) def train(self, validate=False): assert self.mode == 'train', "Model not in 'train' mode" diff --git a/dygraph/ppdet/utils/checkpoint.py b/dygraph/ppdet/utils/checkpoint.py index 193f415ad95f2dffef43a942f1e697f128f2e639..f70cad4fce8c6bb32bde9ae577621e1b69b25334 100644 --- a/dygraph/ppdet/utils/checkpoint.py +++ b/dygraph/ppdet/utils/checkpoint.py @@ -123,8 +123,7 @@ def load_weight(model, weight, optimizer=None): assert incorrect_keys == 0, "Load weight {} incorrectly, \ {} keys unmatched, please check again.".format(weight, incorrect_keys) - logger.info('Finish loading model weight parameter: {}'.format( - pdparam_path)) + logger.info('Finish resuming model weights: {}'.format(pdparam_path)) model.set_dict(model_weight) @@ -142,9 +141,7 @@ def load_weight(model, weight, optimizer=None): return last_epoch -def load_pretrain_weight(model, pretrain_weight, weight_type='pretrain'): - - assert weight_type in ['pretrain', 'finetune'] +def load_pretrain_weight(model, pretrain_weight): if is_url(pretrain_weight): pretrain_weight = get_weights_path_dist(pretrain_weight) @@ -158,24 +155,27 @@ def load_pretrain_weight(model, pretrain_weight, weight_type='pretrain'): model_dict = model.state_dict() - param_state_dict = paddle.load(path + '.pdparams') - if weight_type == 'pretrain': - model.backbone.set_dict(param_state_dict) - else: - ignore_set = set() - for name, weight in model_dict.items(): - if name in param_state_dict.keys(): - if weight.shape != list(param_state_dict[name].shape): - logger.info( - '{} not used, shape {} unmatched with {} in model.'. - format(name, - list(param_state_dict[name].shape), - weight.shape)) - param_state_dict.pop(name, None) - else: - logger.info('Lack weight: {}'.format(name)) - model.set_dict(param_state_dict) - return + weights_path = path + '.pdparams' + param_state_dict = paddle.load(weights_path) + ignore_set = set() + lack_modules = set() + for name, weight in model_dict.items(): + if name in param_state_dict.keys(): + if weight.shape != list(param_state_dict[name].shape): + logger.info( + '{} not used, shape {} unmatched with {} in model.'.format( + name, list(param_state_dict[name].shape), weight.shape)) + param_state_dict.pop(name, None) + else: + lack_modules.add(name.split('.')[0]) + logger.debug('Lack weights: {}'.format(name)) + + if len(lack_modules) > 0: + logger.info('Lack weights of modules: {}'.format(', '.join( + list(lack_modules)))) + + model.set_dict(param_state_dict) + logger.info('Finish loading model weights: {}'.format(weights_path)) def save_model(model, optimizer, save_dir, save_name, last_epoch): diff --git a/dygraph/ppdet/utils/download.py b/dygraph/ppdet/utils/download.py index 858ce035ddff8479ad06c1e900ec42de3956827a..3b50ddd010d1263b30199350418f2d02c085f497 100644 --- a/dygraph/ppdet/utils/download.py +++ b/dygraph/ppdet/utils/download.py @@ -92,7 +92,7 @@ DATASETS = { DOWNLOAD_RETRY_LIMIT = 3 -PPDET_WEIGHTS_DOWNLOAD_URL_PREFIX = 'https://paddlemodels.bj.bcebos.com/object_detection/' +PPDET_WEIGHTS_DOWNLOAD_URL_PREFIX = 'https://paddledet.bj.bcebos.com/' def parse_url(url): diff --git a/dygraph/tools/eval.py b/dygraph/tools/eval.py index 877d06322b98d39ea7f8f93e1a5e7e095e7a89c0..8b0064762d4cbbad8bc0b6461ee289a60d1eec72 100755 --- a/dygraph/tools/eval.py +++ b/dygraph/tools/eval.py @@ -93,7 +93,7 @@ def run(FLAGS, cfg): trainer = Trainer(cfg, mode='eval') # load weights - trainer.load_weights(cfg.weights, 'resume') + trainer.load_weights(cfg.weights) # training trainer.evaluate() diff --git a/dygraph/tools/export_model.py b/dygraph/tools/export_model.py index 656c362e41da3ecd8e8fea2352e5a545a885ce32..d04422873d06e49e2de596d09496c91778251532 100644 --- a/dygraph/tools/export_model.py +++ b/dygraph/tools/export_model.py @@ -62,7 +62,7 @@ def run(FLAGS, cfg): trainer = Trainer(cfg, mode='test') # load weights - trainer.load_weights(cfg.weights, 'resume') + trainer.load_weights(cfg.weights) # export model trainer.export(FLAGS.output_dir) diff --git a/dygraph/tools/infer.py b/dygraph/tools/infer.py index 06a11c28e21ac3ab0b9dbd87487502c3877d925a..9226e1eea84c0ca15d14b917623b193b5edcb779 100755 --- a/dygraph/tools/infer.py +++ b/dygraph/tools/infer.py @@ -114,7 +114,7 @@ def run(FLAGS, cfg): trainer = Trainer(cfg, mode='test') # load weights - trainer.load_weights(cfg.weights, 'resume') + trainer.load_weights(cfg.weights) # get inference images images = get_test_images(FLAGS.infer_dir, FLAGS.infer_img) diff --git a/dygraph/tools/train.py b/dygraph/tools/train.py index 9fd55706c8d3453b5616a47d315f19445387de3c..e7efcd07a30a729435437ae5db1a780f5fc6d7b2 100755 --- a/dygraph/tools/train.py +++ b/dygraph/tools/train.py @@ -43,17 +43,13 @@ logger = setup_logger('train') def parse_args(): parser = cli.ArgsParser() - parser.add_argument( - "--weight_type", - default='pretrain', - type=str, - help="Loading Checkpoints only support 'pretrain', 'finetune', 'resume'." - ) parser.add_argument( "--eval", action='store_true', default=False, help="Whether to perform evaluation in train") + parser.add_argument( + "-r", "--resume", default=None, help="weights path for resume") parser.add_argument( "--slim_config", default=None, @@ -101,8 +97,10 @@ def run(FLAGS, cfg): trainer = Trainer(cfg, mode='train') # load weights - if not FLAGS.slim_config and 'pretrain_weights' in cfg and cfg.pretrain_weights: - trainer.load_weights(cfg.pretrain_weights, FLAGS.weight_type) + if FLAGS.resume is not None: + trainer.resume_weights(FLAGS.resume) + elif not FLAGS.slim_config and 'pretrain_weights' in cfg and cfg.pretrain_weights: + trainer.load_weights(cfg.pretrain_weights) # training trainer.train(FLAGS.eval) @@ -120,8 +118,6 @@ def main(): if FLAGS.slim_config: slim_cfg = load_config(FLAGS.slim_config) merge_config(slim_cfg) - if 'weight_type' not in cfg: - cfg.weight_type = FLAGS.weight_type check.check_config(cfg) check.check_gpu(cfg.use_gpu) check.check_version()