Skip to content

Commit faaf29e

Browse files
xvjiaruixvjiarui
authored
[Improvement] Move train_cfg/test_cfg inside model (#341)
* [Improvement] Move train_cfg/test_cfg inside model * fixed config dict * fixed config dict
1 parent 0ee3016 commit faaf29e

File tree

88 files changed

+266
-247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+266
-247
lines changed

‎configs/_base_/models/ann_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
norm_cfg=norm_cfg,
4141
align_corners=False,
4242
loss_decode=dict(
43-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
44-
# model training and testing settings
45-
train_cfg = dict()
46-
test_cfg = dict(mode='whole')
43+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
44+
# model training and testing settings
45+
train_cfg=dict(),
46+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/apcnet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
norm_cfg=norm_cfg,
3939
align_corners=False,
4040
loss_decode=dict(
41-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
42-
# model training and testing settings
43-
train_cfg = dict()
44-
test_cfg = dict(mode='whole')
41+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
42+
# model training and testing settings
43+
train_cfg=dict(),
44+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/ccnet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
norm_cfg=norm_cfg,
3939
align_corners=False,
4040
loss_decode=dict(
41-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
42-
# model training and testing settings
43-
train_cfg = dict()
44-
test_cfg = dict(mode='whole')
41+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
42+
# model training and testing settings
43+
train_cfg=dict(),
44+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/cgnet.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
10.289121, 9.953208, 4.3097677, 9.490387, 7.674431, 9.396905,
3030
10.347791, 6.3927646, 10.226669, 10.241062, 10.280587,
3131
10.396974, 10.055647
32-
])))
33-
# model training and testing settings
34-
train_cfg = dict(sampler=None)
35-
test_cfg = dict(mode='whole')
32+
])),
33+
# model training and testing settings
34+
train_cfg=dict(sampler=None),
35+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/danet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
norm_cfg=norm_cfg,
3939
align_corners=False,
4040
loss_decode=dict(
41-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
42-
# model training and testing settings
43-
train_cfg = dict()
44-
test_cfg = dict(mode='whole')
41+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
42+
# model training and testing settings
43+
train_cfg=dict(),
44+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/deeplabv3_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
norm_cfg=norm_cfg,
3939
align_corners=False,
4040
loss_decode=dict(
41-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
42-
# model training and testing settings
43-
train_cfg = dict()
44-
test_cfg = dict(mode='whole')
41+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
42+
# model training and testing settings
43+
train_cfg=dict(),
44+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/deeplabv3_unet_s5-d16.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
norm_cfg=norm_cfg,
4545
align_corners=False,
4646
loss_decode=dict(
47-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
48-
# model training and testing settings
49-
train_cfg = dict()
50-
test_cfg = dict(mode='slide', crop_size=256, stride=170)
47+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
48+
# model training and testing settings
49+
train_cfg=dict(),
50+
test_cfg=dict(mode='slide', crop_size=256, stride=170))

‎configs/_base_/models/deeplabv3plus_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
norm_cfg=norm_cfg,
4141
align_corners=False,
4242
loss_decode=dict(
43-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
44-
# model training and testing settings
45-
train_cfg = dict()
46-
test_cfg = dict(mode='whole')
43+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
44+
# model training and testing settings
45+
train_cfg=dict(),
46+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/dmnet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
norm_cfg=norm_cfg,
3939
align_corners=False,
4040
loss_decode=dict(
41-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
42-
# model training and testing settings
43-
train_cfg = dict()
44-
test_cfg = dict(mode='whole')
41+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
42+
# model training and testing settings
43+
train_cfg=dict(),
44+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/dnl_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
norm_cfg=norm_cfg,
4141
align_corners=False,
4242
loss_decode=dict(
43-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
44-
# model training and testing settings
45-
train_cfg = dict()
46-
test_cfg = dict(mode='whole')
43+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
44+
# model training and testing settings
45+
train_cfg=dict(),
46+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/emanet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
norm_cfg=norm_cfg,
4242
align_corners=False,
4343
loss_decode=dict(
44-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
45-
# model training and testing settings
46-
train_cfg = dict()
47-
test_cfg = dict(mode='whole')
44+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
45+
# model training and testing settings
46+
train_cfg=dict(),
47+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/encnet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
norm_cfg=norm_cfg,
4343
align_corners=False,
4444
loss_decode=dict(
45-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
46-
# model training and testing settings
47-
train_cfg = dict()
48-
test_cfg = dict(mode='whole')
45+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
46+
# model training and testing settings
47+
train_cfg=dict(),
48+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/fast_scnn.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@
5151
align_corners=False,
5252
loss_decode=dict(
5353
type='CrossEntropyLoss', use_sigmoid=True, loss_weight=0.4)),
54-
])
55-
56-
# model training and testing settings
57-
train_cfg = dict()
58-
test_cfg = dict(mode='whole')
54+
],
55+
# model training and testing settings
56+
train_cfg=dict(),
57+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/fcn_hr18.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
norm_cfg=norm_cfg,
4747
align_corners=False,
4848
loss_decode=dict(
49-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0)))
50-
# model training and testing settings
51-
train_cfg = dict()
52-
test_cfg = dict(mode='whole')
49+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0)),
50+
# model training and testing settings
51+
train_cfg=dict(),
52+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/fcn_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
norm_cfg=norm_cfg,
4040
align_corners=False,
4141
loss_decode=dict(
42-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
43-
# model training and testing settings
44-
train_cfg = dict()
45-
test_cfg = dict(mode='whole')
42+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
43+
# model training and testing settings
44+
train_cfg=dict(),
45+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/fcn_unet_s5-d16.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
norm_cfg=norm_cfg,
4646
align_corners=False,
4747
loss_decode=dict(
48-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
49-
# model training and testing settings
50-
train_cfg = dict()
51-
test_cfg = dict(mode='slide', crop_size=256, stride=170)
48+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
49+
# model training and testing settings
50+
train_cfg=dict(),
51+
test_cfg=dict(mode='slide', crop_size=256, stride=170))

‎configs/_base_/models/fpn_r50.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
norm_cfg=norm_cfg,
3131
align_corners=False,
3232
loss_decode=dict(
33-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0)))
34-
# model training and testing settings
35-
train_cfg = dict()
36-
test_cfg = dict(mode='whole')
33+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0)),
34+
# model training and testing settings
35+
train_cfg=dict(),
36+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/gcnet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
norm_cfg=norm_cfg,
4141
align_corners=False,
4242
loss_decode=dict(
43-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
44-
# model training and testing settings
45-
train_cfg = dict()
46-
test_cfg = dict(mode='whole')
43+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
44+
# model training and testing settings
45+
train_cfg=dict(),
46+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/lraspp_m-v3-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
act_cfg=dict(type='ReLU'),
2020
align_corners=False,
2121
loss_decode=dict(
22-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0)))
23-
# model training and testing settings
24-
train_cfg = dict()
25-
test_cfg = dict(mode='whole')
22+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0)),
23+
# model training and testing settings
24+
train_cfg=dict(),
25+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/nonlocal_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
norm_cfg=norm_cfg,
4141
align_corners=False,
4242
loss_decode=dict(
43-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
44-
# model training and testing settings
45-
train_cfg = dict()
46-
test_cfg = dict(mode='whole')
43+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
44+
# model training and testing settings
45+
train_cfg=dict(),
46+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/ocrnet_hr18.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
align_corners=False,
6363
loss_decode=dict(
6464
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0)),
65-
])
66-
# model training and testing settings
67-
train_cfg = dict()
68-
test_cfg = dict(mode='whole')
65+
],
66+
# model training and testing settings
67+
train_cfg=dict(),
68+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/ocrnet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
align_corners=False,
4242
loss_decode=dict(
4343
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0))
44-
])
45-
# model training and testing settings
46-
train_cfg = dict()
47-
test_cfg = dict(mode='whole')
44+
],
45+
# model training and testing settings
46+
train_cfg=dict(),
47+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/pointrend_r50.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
align_corners=False,
4646
loss_decode=dict(
4747
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0))
48-
])
49-
# model training and testing settings
50-
train_cfg = dict(
51-
num_points=2048, oversample_ratio=3, importance_sample_ratio=0.75)
52-
test_cfg = dict(
53-
mode='whole',
54-
subdivision_steps=2,
55-
subdivision_num_points=8196,
56-
scale_factor=2)
48+
],
49+
# model training and testing settings
50+
train_cfg=dict(
51+
num_points=2048, oversample_ratio=3, importance_sample_ratio=0.75),
52+
test_cfg=dict(
53+
mode='whole',
54+
subdivision_steps=2,
55+
subdivision_num_points=8196,
56+
scale_factor=2))

‎configs/_base_/models/psanet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
norm_cfg=norm_cfg,
4444
align_corners=False,
4545
loss_decode=dict(
46-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
47-
# model training and testing settings
48-
train_cfg = dict()
49-
test_cfg = dict(mode='whole')
46+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
47+
# model training and testing settings
48+
train_cfg=dict(),
49+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/pspnet_r50-d8.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
norm_cfg=norm_cfg,
3939
align_corners=False,
4040
loss_decode=dict(
41-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
42-
# model training and testing settings
43-
train_cfg = dict()
44-
test_cfg = dict(mode='whole')
41+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
42+
# model training and testing settings
43+
train_cfg=dict(),
44+
test_cfg=dict(mode='whole'))

‎configs/_base_/models/pspnet_unet_s5-d16.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
norm_cfg=norm_cfg,
4545
align_corners=False,
4646
loss_decode=dict(
47-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
48-
# model training and testing settings
49-
train_cfg = dict()
50-
test_cfg = dict(mode='slide', crop_size=256, stride=170)
47+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
48+
# model training and testing settings
49+
train_cfg=dict(),
50+
test_cfg=dict(mode='slide', crop_size=256, stride=170))

‎configs/_base_/models/upernet_r50.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
norm_cfg=norm_cfg,
3939
align_corners=False,
4040
loss_decode=dict(
41-
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)))
42-
# model training and testing settings
43-
train_cfg = dict()
44-
test_cfg = dict(mode='whole')
41+
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
42+
# model training and testing settings
43+
train_cfg=dict(),
44+
test_cfg=dict(mode='whole'))

‎configs/ann/ann_r50-d8_769x769_40k_cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
]
66
model = dict(
77
decode_head=dict(align_corners=True),
8-
auxiliary_head=dict(align_corners=True))
9-
test_cfg = dict(mode='slide', crop_size=(769, 769), stride=(513, 513))
8+
auxiliary_head=dict(align_corners=True),
9+
test_cfg=dict(mode='slide', crop_size=(769, 769), stride=(513, 513)))

‎configs/ann/ann_r50-d8_769x769_80k_cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
]
66
model = dict(
77
decode_head=dict(align_corners=True),
8-
auxiliary_head=dict(align_corners=True))
9-
test_cfg = dict(mode='slide', crop_size=(769, 769), stride=(513, 513))
8+
auxiliary_head=dict(align_corners=True),
9+
test_cfg=dict(mode='slide', crop_size=(769, 769), stride=(513, 513)))

‎configs/apcnet/apcnet_r50-d8_769x769_40k_cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
]
66
model = dict(
77
decode_head=dict(align_corners=True),
8-
auxiliary_head=dict(align_corners=True))
9-
test_cfg = dict(mode='slide', crop_size=(769, 769), stride=(513, 513))
8+
auxiliary_head=dict(align_corners=True),
9+
test_cfg=dict(mode='slide', crop_size=(769, 769), stride=(513, 513)))

‎configs/apcnet/apcnet_r50-d8_769x769_80k_cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
]
66
model = dict(
77
decode_head=dict(align_corners=True),
8-
auxiliary_head=dict(align_corners=True))
9-
test_cfg = dict(mode='slide', crop_size=(769, 769), stride=(513, 513))
8+
auxiliary_head=dict(align_corners=True),
9+
test_cfg=dict(mode='slide', crop_size=(769, 769), stride=(513, 513)))

‎configs/ccnet/ccnet_r50-d8_769x769_40k_cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
]
66
model = dict(
77
decode_head=dict(align_corners=True),
8-
auxiliary_head=dict(align_corners=True))
9-
test_cfg = dict(mode='slide', crop_size=(769, 769), stride=(513, 513))
8+
auxiliary_head=dict(align_corners=True),
9+
test_cfg=dict(mode='slide', crop_size=(769, 769), stride=(513, 513)))

‎configs/ccnet/ccnet_r50-d8_769x769_80k_cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
]
66
model = dict(
77
decode_head=dict(align_corners=True),
8-
auxiliary_head=dict(align_corners=True))
9-
test_cfg = dict(mode='slide', crop_size=(769, 769), stride=(513, 513))
8+
auxiliary_head=dict(align_corners=True),
9+
test_cfg=dict(mode='slide', crop_size=(769, 769), stride=(513, 513)))

‎configs/danet/danet_r50-d8_769x769_40k_cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
]
66
model = dict(
77
decode_head=dict(align_corners=True),
8-
auxiliary_head=dict(align_corners=True))
9-
test_cfg = dict(mode='slide', crop_size=(769, 769), stride=(513, 513))
8+
auxiliary_head=dict(align_corners=True),
9+
test_cfg=dict(mode='slide', crop_size=(769, 769), stride=(513, 513)))

‎configs/danet/danet_r50-d8_769x769_80k_cityscapes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
]
66
model = dict(
77
decode_head=dict(align_corners=True),
8-
auxiliary_head=dict(align_corners=True))
9-
test_cfg = dict(mode='slide', crop_size=(769, 769), stride=(513, 513))
8+
auxiliary_head=dict(align_corners=True),
9+
test_cfg=dict(mode='slide', crop_size=(769, 769), stride=(513, 513)))

0 commit comments

Comments
 (0)