[Improvement] Move train_cfg/test_cfg inside model (open-mmlab#341)

* [Improvement] Move train_cfg/test_cfg inside model

* fixed config dict

* fixed config dict

Author: xvjiarui

configs/_base_/models/ann_r50-d8.py

@@ -40,7 +40,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='whole')
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='whole'))

configs/_base_/models/apcnet_r50-d8.py

@@ -38,7 +38,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='whole')
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='whole'))

configs/_base_/models/ccnet_r50-d8.py

@@ -38,7 +38,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='whole')
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='whole'))

configs/_base_/models/cgnet.py

@@ -29,7 +29,7 @@
                 10.289121, 9.953208, 4.3097677, 9.490387, 7.674431, 9.396905,
                 10.347791, 6.3927646, 10.226669, 10.241062, 10.280587,
                 10.396974, 10.055647
-            ])))
-# model training and testing settings
-train_cfg = dict(sampler=None)
-test_cfg = dict(mode='whole')
+            ])),
+    # model training and testing settings
+    train_cfg=dict(sampler=None),
+    test_cfg=dict(mode='whole'))

configs/_base_/models/danet_r50-d8.py

@@ -38,7 +38,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='whole')
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='whole'))

configs/_base_/models/deeplabv3_r50-d8.py

@@ -38,7 +38,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='whole')
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='whole'))

configs/_base_/models/deeplabv3_unet_s5-d16.py

@@ -44,7 +44,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='slide', crop_size=256, stride=170)
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='slide', crop_size=256, stride=170))

configs/_base_/models/deeplabv3plus_r50-d8.py

@@ -40,7 +40,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='whole')
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='whole'))

configs/_base_/models/dmnet_r50-d8.py

@@ -38,7 +38,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='whole')
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='whole'))

configs/_base_/models/dnl_r50-d8.py

@@ -40,7 +40,7 @@
         norm_cfg=norm_cfg,
         align_corners=False,
         loss_decode=dict(
-            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
-# model training and testing settings
-train_cfg = dict()
-test_cfg = dict(mode='whole')
+            type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
+    # model training and testing settings
+    train_cfg=dict(),
+    test_cfg=dict(mode='whole'))