[Feature] Refactor optimizer as component (PaddlePaddle#2893)

PeiyuLau · Jan 5, 2023 · 6973990 · 6973990
1 parent d304ed5
commit 6973990
Show file tree

Hide file tree

Showing 92 changed files with 478 additions and 607 deletions.
diff --git a/configs/_base_/ade20k.yml b/configs/_base_/ade20k.yml
@@ -28,7 +28,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/_base_/autonue.yml b/configs/_base_/autonue.yml
@@ -39,7 +39,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.0001
 

diff --git a/configs/_base_/chase_db1.yml b/configs/_base_/chase_db1.yml
@@ -29,7 +29,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/_base_/cityscapes.yml b/configs/_base_/cityscapes.yml
@@ -28,7 +28,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/_base_/coco_stuff.yml b/configs/_base_/coco_stuff.yml
@@ -28,7 +28,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/_base_/drive.yml b/configs/_base_/drive.yml
@@ -29,7 +29,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/_base_/hrf.yml b/configs/_base_/hrf.yml
@@ -31,7 +31,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/_base_/pascal_context.yml b/configs/_base_/pascal_context.yml
@@ -30,7 +30,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/_base_/pascal_voc12.yml b/configs/_base_/pascal_voc12.yml
@@ -30,7 +30,7 @@ val_dataset:
 
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/_base_/stare.yml b/configs/_base_/stare.yml
@@ -28,7 +28,7 @@ val_dataset:
   mode: val
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-5
 

diff --git a/configs/bisenet/bisenet_cityscapes_1024x1024_160k.yml b/configs/bisenet/bisenet_cityscapes_1024x1024_160k.yml
@@ -5,7 +5,7 @@ model:
   num_classes: 19
 
 optimizer:
-  type: sgd
+  type: SGD
   weight_decay: 0.0005
 
 loss:

diff --git a/configs/bisenetv1/bisenetv1_resnet18_os8_cityscapes_1024x512_160k.yml b/configs/bisenetv1/bisenetv1_resnet18_os8_cityscapes_1024x512_160k.yml
@@ -11,7 +11,7 @@ model:
     pretrained: https://bj.bcebos.com/paddleseg/dygraph/resnet18_vd_ssld_v2.tar.gz
 
 optimizer:
-  type: sgd
+  type: SGD
   weight_decay: 0.0005
 
 loss:

diff --git a/configs/danet/danet_resnet101_os8_cityscapes_1024x512_80k.yml b/configs/danet/danet_resnet101_os8_cityscapes_1024x512_80k.yml
@@ -13,7 +13,7 @@ model:
   backbone_indices: [2, 3]
 
 optimizer:
-  type: sgd
+  type: SGD
 
 lr_scheduler:
   type: PolynomialDecay

diff --git a/configs/danet/danet_resnet50_os8_cityscapes_1024x512_80k.yml b/configs/danet/danet_resnet50_os8_cityscapes_1024x512_80k.yml
@@ -13,7 +13,7 @@ model:
   backbone_indices: [2, 3]
 
 optimizer:
-  type: sgd
+  type: SGD
 
 lr_scheduler:
   type: PolynomialDecay

diff --git a/configs/ddrnet/ddrnet23_cityscapes_1024x1024_120k.yml b/configs/ddrnet/ddrnet23_cityscapes_1024x1024_120k.yml
@@ -9,7 +9,7 @@ model:
   pretrained: https://bj.bcebos.com/paddleseg/dygraph/cityscapes/ddrnet23_cityscapes_1024x1024_120k/pretrain/model.pdparams
 
 optimizer:
-  type: sgd
+  type: SGD
   weight_decay: 0.0005
 
 loss:

diff --git a/configs/dmnet/dmnet_resnet101_os8_cityscapes_1024x512_80k.yml b/configs/dmnet/dmnet_resnet101_os8_cityscapes_1024x512_80k.yml
@@ -11,7 +11,7 @@ model:
     pretrained: https://bj.bcebos.com/paddleseg/dygraph/resnet101_vd_ssld.tar.gz
 
 optimizer:
-  type: sgd
+  type: SGD
   weight_decay: 0.0005
 
 loss:

diff --git a/configs/dnlnet/dnlnet_resnet101_os8_cityscapes_1024x512_80k.yml b/configs/dnlnet/dnlnet_resnet101_os8_cityscapes_1024x512_80k.yml
@@ -12,7 +12,7 @@ model:
   num_classes: 19
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.00004
 

diff --git a/configs/dnlnet/dnlnet_resnet101_os8_voc12aug_512x512_40k.yml b/configs/dnlnet/dnlnet_resnet101_os8_voc12aug_512x512_40k.yml
@@ -8,7 +8,7 @@ model:
     pretrained: https://bj.bcebos.com/paddleseg/dygraph/resnet101_vd_ssld.tar.gz
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-05
 

diff --git a/configs/dnlnet/dnlnet_resnet50_os8_cityscapes_1024x512_80k.yml b/configs/dnlnet/dnlnet_resnet50_os8_cityscapes_1024x512_80k.yml
@@ -12,7 +12,7 @@ model:
   num_classes: 19
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.00004
 

diff --git a/configs/dnlnet/dnlnet_resnet50_os8_voc12aug_512x512_40k.yml b/configs/dnlnet/dnlnet_resnet50_os8_voc12aug_512x512_40k.yml
@@ -8,7 +8,7 @@ model:
     pretrained: https://bj.bcebos.com/paddleseg/dygraph/resnet50_vd_ssld_v2.tar.gz
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-05
 

diff --git a/configs/emanet/emanet_resnet101_os8_cityscapes_1024x512_80k.yml b/configs/emanet/emanet_resnet101_os8_cityscapes_1024x512_80k.yml
@@ -20,7 +20,7 @@ model:
   align_corners: False
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.0005
 

diff --git a/configs/emanet/emanet_resnet101_os8_voc12aug_512x512_40k.yml b/configs/emanet/emanet_resnet101_os8_voc12aug_512x512_40k.yml
@@ -16,7 +16,7 @@ model:
   align_corners: True
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.0005
 

diff --git a/configs/emanet/emanet_resnet50_os8_cityscapes_1024x512_80k.yml b/configs/emanet/emanet_resnet50_os8_cityscapes_1024x512_80k.yml
@@ -20,7 +20,7 @@ model:
   align_corners: False
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.0005
 

diff --git a/configs/emanet/emanet_resnet50_os8_voc12aug_512x512_40k.yml b/configs/emanet/emanet_resnet50_os8_voc12aug_512x512_40k.yml
@@ -17,7 +17,7 @@ model:
   align_corners: True
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.0005
 

diff --git a/configs/encnet/encnet_resnet101_os8_cityscapes_1024x512_80k.yml b/configs/encnet/encnet_resnet101_os8_cityscapes_1024x512_80k.yml
@@ -16,7 +16,7 @@ model:
   add_lateral: True
 
 optimizer:
-  type: sgd
+  type: SGD
   weight_decay: 0.0005
 
 loss:

diff --git a/configs/enet/enet_cityscapes_1024x512_80k.yml b/configs/enet/enet_cityscapes_1024x512_80k.yml
@@ -21,7 +21,7 @@ model:
 
 optimizer:
   _inherited_: False
-  type: adam
+  type: Adam
   weight_decay: 0.0002
 
 lr_scheduler:

diff --git a/configs/espnet/espnet_cityscapes_1024x512_120k.yml b/configs/espnet/espnet_cityscapes_1024x512_120k.yml
@@ -6,7 +6,7 @@ iters: 120000
 
 optimizer:
   _inherited_: False
-  type: adam
+  type: Adam
   weight_decay: 0.0002
 
 lr_scheduler:

diff --git a/configs/espnetv1/espnetv1_cityscapes_1024x512_120k.yml b/configs/espnetv1/espnetv1_cityscapes_1024x512_120k.yml
@@ -5,7 +5,7 @@ iters: 120000
 
 optimizer:
   _inherited_: False
-  type: adam
+  type: Adam
   weight_decay: 0.0002
 
 lr_scheduler:

diff --git a/configs/fcn/fcn_hrnetw18_pphumanseg14k.yml b/configs/fcn/fcn_hrnetw18_pphumanseg14k.yml
@@ -34,7 +34,7 @@ model:
   backbone_indices: [-1]
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.0005
 

diff --git a/configs/hardnet/hardnet_cityscapes_1024x1024_160k.yml b/configs/hardnet/hardnet_cityscapes_1024x1024_160k.yml
@@ -8,7 +8,7 @@ lr_scheduler:
   learning_rate: 0.02
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 5.0e-4
 

diff --git a/configs/hrnet_w48_contrast/HRNet_W48_contrast_cityscapes_1024x512_60k.yml b/configs/hrnet_w48_contrast/HRNet_W48_contrast_cityscapes_1024x512_60k.yml
@@ -5,7 +5,7 @@ iters: 60000
 
 
 optimizer:
-  type: sgd
+  type: SGD
   weight_decay: 0.0002
 
 loss:
@@ -24,6 +24,6 @@ model:
   backbone:
     type: HRNet_W48
     pretrained: https://bj.bcebos.com/paddleseg/dygraph/hrnet_w48_ssld.tar.gz
-  in_channels: 720
+  bb_channels: 720
   drop_prob: 0.1
   proj_dim: 720
diff --git a/configs/isanet/isanet_resnet101_os8_cityscapes_769x769_80k.yml b/configs/isanet/isanet_resnet101_os8_cityscapes_769x769_80k.yml
@@ -13,7 +13,7 @@ model:
   num_classes: 19
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.00001
 

diff --git a/configs/isanet/isanet_resnet101_os8_voc12aug_512x512_40k.yml b/configs/isanet/isanet_resnet101_os8_voc12aug_512x512_40k.yml
@@ -10,7 +10,7 @@ model:
   align_corners: True
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 4.0e-05
 

diff --git a/configs/isanet/isanet_resnet50_os8_cityscapes_769x769_80k.yml b/configs/isanet/isanet_resnet50_os8_cityscapes_769x769_80k.yml
@@ -13,7 +13,7 @@ model:
   num_classes: 19
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.00001
 

diff --git a/configs/isanet/isanet_resnet50_os8_voc12aug_512x512_40k.yml b/configs/isanet/isanet_resnet50_os8_voc12aug_512x512_40k.yml
@@ -10,7 +10,7 @@ model:
   align_corners: True
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.00001
 

diff --git a/configs/lpsnet/lpsnet_m_cityscapes_1536x1024_200k.yml b/configs/lpsnet/lpsnet_m_cityscapes_1536x1024_200k.yml
@@ -27,7 +27,7 @@ val_dataset:
       std: [0.229, 0.224, 0.225]
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 0.0005
 

diff --git a/configs/mscale_ocrnet/mscale_ocrnet_hrnetv2_psa_cityscapes_1024x2048_150k.yml b/configs/mscale_ocrnet/mscale_ocrnet_hrnetv2_psa_cityscapes_1024x2048_150k.yml
@@ -34,12 +34,6 @@ val_dataset:
       std: [0.229, 0.224, 0.225]
   mode: val
 
-export:
-  transforms:
-    - type: Normalize
-      mean: [0.485, 0.456, 0.406]
-      std: [0.229, 0.224, 0.225]
-
 model:
     type: MscaleOCRNet
     num_classes: 19
@@ -50,7 +44,7 @@ model:
     pretrained: https://paddleseg.bj.bcebos.com/dygraph/cityscapes/mscale_ocrnet_hrnetv2_psa_cityscapes_1024x2048_150k/mscale_ocrnet_pretrained_mappilary.zip
 
 optimizer:
-  type: sgd
+  type: SGD
   momentum: 0.9
   weight_decay: 5.0e-4
 

diff --git a/configs/ocrnet/ocrnet_hrnetw18_cityscapes_1024x512_160k.yml b/configs/ocrnet/ocrnet_hrnetw18_cityscapes_1024x512_160k.yml
@@ -12,7 +12,7 @@ model:
   backbone_indices: [0]
 
 optimizer:
-  type: sgd
+  type: SGD
 
 lr_scheduler:
   type: PolynomialDecay

diff --git a/configs/ocrnet/ocrnet_hrnetw18_cityscapes_1024x512_160k_lovasz_softmax.yml b/configs/ocrnet/ocrnet_hrnetw18_cityscapes_1024x512_160k_lovasz_softmax.yml
@@ -11,7 +11,7 @@ model:
   backbone_indices: [0]
 
 optimizer:
-  type: sgd
+  type: SGD
 
 lr_scheduler:
   type: PolynomialDecay

diff --git a/configs/ocrnet/ocrnet_hrnetw18_road_extraction_768x768_15k.yml b/configs/ocrnet/ocrnet_hrnetw18_road_extraction_768x768_15k.yml
@@ -32,7 +32,7 @@ model:
   backbone_indices: [0]
 
 optimizer:
-  type: sgd
+  type: SGD
 
 lr_scheduler:
   type: PolynomialDecay

diff --git a/configs/ocrnet/ocrnet_hrnetw18_road_extraction_768x768_15k_lovasz_hinge.yml b/configs/ocrnet/ocrnet_hrnetw18_road_extraction_768x768_15k_lovasz_hinge.yml
@@ -32,7 +32,7 @@ model:
   backbone_indices: [0]
 
 optimizer:
-  type: sgd
+  type: SGD
 
 lr_scheduler:
   type: PolynomialDecay

diff --git a/configs/ocrnet/ocrnet_hrnetw18_voc12aug_512x512_40k.yml b/configs/ocrnet/ocrnet_hrnetw18_voc12aug_512x512_40k.yml
@@ -8,7 +8,7 @@ model:
   backbone_indices: [0]
 
 optimizer:
-  type: sgd
+  type: SGD
 
 lr_scheduler:
   type: PolynomialDecay