Simplify configurations a bit (#2510)

PaddleCV/object_detection/configs/cascade_rcnn_r50_fpn_1x.yml

@@ -18,7 +18,7 @@ CascadeRCNN:
   roi_extractor: FPNRoIAlign
   bbox_head: CascadeBBoxHead
   bbox_assigner: CascadeBBoxAssigner
-  
+
 ResNet:
   norm_type: affine_channel
   depth: 50
@@ -26,7 +26,6 @@ ResNet:
   freeze_at: 2
   variant: b
 
-
 FPN:
   min_level: 2
   max_level: 6
@@ -59,7 +58,7 @@ FPNRPNHead:
     nms_thresh: 0.7
     pre_nms_top_n: 1000
     post_nms_top_n: 1000
-    
+
 FPNRoIAlign:
   canconical_level: 4
   canonical_size: 224
@@ -87,6 +86,7 @@ CascadeBBoxHead:
 
 FC6FC7Head:
   num_chan: 1024
+
 LearningRate:
   base_lr: 0.02
   schedulers:
@@ -116,8 +116,8 @@ FasterRCNNTrainFeed:
     image_dir: train2017
   drop_last: false
   num_workers: 2
-  shuffle: true 
-  
+  shuffle: true
+
 FasterRCNNEvalFeed:
   batch_size: 1
   batch_transforms:

PaddleCV/object_detection/configs/faster_rcnn_r101_1x.yml

@@ -21,7 +21,7 @@ FasterRCNN:
 ResNet:
   norm_type: affine_channel
   depth: 101
-  feature_maps: [2,3,4]
+  feature_maps: 4
   freeze_at: 2
 
 ResNetC5:
@@ -117,4 +117,3 @@ FasterRCNNTestFeed:
     image_dir: val2017
   test_file: val2017.txt
   samples: 5
-

PaddleCV/object_detection/configs/faster_rcnn_r50_1x.yml

@@ -21,7 +21,7 @@ FasterRCNN:
 ResNet:
   norm_type: affine_channel
   depth: 50
-  feature_maps: [2,3,4]
+  feature_maps: 4
   freeze_at: 2
 
 ResNetC5:

PaddleCV/object_detection/configs/faster_rcnn_r50_2x.yml

@@ -21,7 +21,7 @@ FasterRCNN:
 ResNet:
   norm_type: affine_channel
   depth: 50
-  feature_maps: [2,3,4]
+  feature_maps: 4
   freeze_at: 2
 
 ResNetC5:

PaddleCV/object_detection/configs/faster_rcnn_r50_vd_1x.yml

@@ -21,7 +21,7 @@ FasterRCNN:
 ResNet:
   norm_type: affine_channel
   depth: 50
-  feature_maps: [2,3,4]
+  feature_maps: 4
   freeze_at: 2
   variant: d
 

PaddleCV/object_detection/configs/faster_rcnn_se154_1x.yml

@@ -21,7 +21,7 @@ FasterRCNN:
 
 SENet:
   depth: 152
-  feature_maps: [2, 3, 4]
+  feature_maps: 4
   freeze_at: 2
   group_width: 4
   groups: 64
@@ -30,7 +30,6 @@ SENet:
 
 SENetC5:
   depth: 152
-  feature_maps: 5
   freeze_at: 2
   group_width: 4
   groups: 64
@@ -122,7 +121,7 @@ FasterRCNNEvalFeed:
 FasterRCNNTestFeed:
   batch_size: 1
   dataset:
-    dataset_dir: data/coco 
+    dataset_dir: data/coco
     annotation: annotations/instances_val2017.json
     image_dir: val2017
   test_file: val2017.txt

PaddleCV/object_detection/configs/mask_rcnn_r50_1x.yml

@@ -25,7 +25,7 @@ ResNet:
   norm_type: affine_channel
   norm_decay: true
   depth: 50
-  feature_maps: [2,3, 4]
+  feature_maps: 4
   freeze_at: 2
 
 ResNetC5:

PaddleCV/object_detection/configs/mask_rcnn_r50_2x.yml

@@ -9,7 +9,7 @@ log_smooth_window: 20
 save_dir: output
 pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_pretrained.tar
 metric: COCO
-weights: output/mask_rcnn_r50_2x/model_final/ 
+weights: output/mask_rcnn_r50_2x/model_final/
 
 MaskRCNN:
   backbone: ResNet
@@ -25,7 +25,7 @@ ResNet:
   norm_type: affine_channel
   norm_decay: true
   depth: 50
-  feature_maps: [2,3, 4]
+  feature_maps: 4
   freeze_at: 2
 
 ResNetC5:

PaddleCV/object_detection/configs/mask_rcnn_r50_vd_fpn_2x.yml

@@ -9,7 +9,7 @@ log_smooth_window: 20
 save_dir: output
 pretrain_weights: https://paddle-imagenet-models-name.bj.bcebos.com/ResNet50_vd_pretrained.tar
 metric: COCO
-weights: output/mask_rcnn_r50_vd_fpn_2x/model_final/ 
+weights: output/mask_rcnn_r50_vd_fpn_2x/model_final/
 
 MaskRCNN:
   backbone: ResNet
@@ -24,7 +24,7 @@ ResNet:
   feature_maps: [2, 3, 4, 5]
   freeze_at: 2
   norm_type: affine_channel
-  variant: d 
+  variant: d
 
 FPN:
   max_level: 6

PaddleCV/object_detection/configs/ssd_mobilenet_v1_voc.yml

@@ -16,7 +16,7 @@ SSD:
   backbone: MobileNet
   multi_box_head: MultiBoxHead
   num_classes: 21
-  metric: 
+  metric:
     ap_version: 11point
     evaluate_difficult: false
     overlap_threshold: 0.5
@@ -57,7 +57,7 @@ OptimizerBuilder:
   regularizer:
     factor: 0.00005
     type: L2
-    
+
 SSDTrainFeed:
   batch_size: 32
   use_process: true

PaddleCV/object_detection/tools/infer.py

@@ -49,7 +49,7 @@ def main():
     merge_config(args.cli_config)
 
     if 'test_feed' not in cfg:
-        test_feed = create(type(main_arch).__name__ + 'TestFeed')
+        test_feed = create(main_arch + 'TestFeed')
     else:
         test_feed = create(cfg['test_feed'])
 

PaddleCV/object_detection/tools/train.py

@@ -56,13 +56,13 @@ def main():
         devices_num = int(os.environ.get('CPU_NUM', multiprocessing.cpu_count()))
 
     if 'train_feed' not in cfg:
-        train_feed = create(type(main_arch).__name__ + 'TrainFeed')
+        train_feed = create(main_arch + 'TrainFeed')
     else:
         train_feed = create(cfg['train_feed'])
 
     if args.eval:
         if 'eval_feed' not in cfg:
-            eval_feed = create(type(main_arch).__name__ + 'EvalFeed')
+            eval_feed = create(main_arch + 'EvalFeed')
         else:
             eval_feed = create(cfg['eval_feed'])