Skip to content

Commit 9caacc7

Browse files
authored
[Enhancement] Deprecate file_client_args and use backend_args instead (#1765)
* tmp commit * remove
1 parent 63a6ed4 commit 9caacc7

39 files changed

+144
-300
lines changed

configs/textdet/dbnet/_base_dbnet_resnet18_fpnc.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
file_client_args = dict(backend='disk')
2-
31
model = dict(
42
type='DBNet',
53
backbone=dict(
@@ -27,10 +25,7 @@
2725
pad_size_divisor=32))
2826

2927
train_pipeline = [
30-
dict(
31-
type='LoadImageFromFile',
32-
file_client_args=file_client_args,
33-
color_type='color_ignore_orientation'),
28+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
3429
dict(
3530
type='LoadOCRAnnotations',
3631
with_polygon=True,
@@ -55,10 +50,7 @@
5550
]
5651

5752
test_pipeline = [
58-
dict(
59-
type='LoadImageFromFile',
60-
file_client_args=file_client_args,
61-
color_type='color_ignore_orientation'),
53+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
6254
dict(type='Resize', scale=(1333, 736), keep_ratio=True),
6355
dict(
6456
type='LoadOCRAnnotations',

configs/textdet/dbnet/_base_dbnet_resnet50-dcnv2_fpnc.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
file_client_args = dict(backend='disk')
2-
31
model = dict(
42
type='DBNet',
53
backbone=dict(
@@ -29,10 +27,7 @@
2927
pad_size_divisor=32))
3028

3129
train_pipeline = [
32-
dict(
33-
type='LoadImageFromFile',
34-
file_client_args=file_client_args,
35-
color_type='color_ignore_orientation'),
30+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
3631
dict(
3732
type='LoadOCRAnnotations',
3833
with_bbox=True,
@@ -57,10 +52,7 @@
5752
]
5853

5954
test_pipeline = [
60-
dict(
61-
type='LoadImageFromFile',
62-
file_client_args=file_client_args,
63-
color_type='color_ignore_orientation'),
55+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
6456
dict(type='Resize', scale=(4068, 1024), keep_ratio=True),
6557
dict(
6658
type='LoadOCRAnnotations',

configs/textdet/dbnet/dbnet_resnet18_fpnc_100k_synthtext.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@
55
'../_base_/schedules/schedule_sgd_100k.py',
66
]
77

8-
file_client_args = dict(backend='disk')
9-
108
train_pipeline = [
11-
dict(
12-
type='LoadImageFromFile',
13-
file_client_args=file_client_args,
14-
color_type='color_ignore_orientation'),
9+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
1510
dict(
1611
type='LoadOCRAnnotations',
1712
with_polygon=True,

configs/textdet/dbnet/dbnet_resnet18_fpnc_1200e_totaltext.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,8 @@
55
'../_base_/schedules/schedule_sgd_1200e.py',
66
]
77

8-
file_client_args = dict(backend='disk')
9-
108
train_pipeline = [
11-
dict(
12-
type='LoadImageFromFile',
13-
file_client_args=file_client_args,
14-
color_type='color_ignore_orientation'),
9+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
1510
dict(
1611
type='LoadOCRAnnotations',
1712
with_polygon=True,
@@ -37,10 +32,7 @@
3732
]
3833

3934
test_pipeline = [
40-
dict(
41-
type='LoadImageFromFile',
42-
file_client_args=file_client_args,
43-
color_type='color_ignore_orientation'),
35+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
4436
dict(type='Resize', scale=(1333, 736), keep_ratio=True),
4537
dict(
4638
type='LoadOCRAnnotations',

configs/textdet/drrg/_base_drrg_resnet50_fpn-unet.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
file_client_args = dict(backend='disk')
2-
31
model = dict(
42
type='DRRG',
53
backbone=dict(
@@ -29,10 +27,7 @@
2927
pad_size_divisor=32))
3028

3129
train_pipeline = [
32-
dict(
33-
type='LoadImageFromFile',
34-
file_client_args=file_client_args,
35-
color_type='color_ignore_orientation'),
30+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
3631
dict(
3732
type='LoadOCRAnnotations',
3833
with_bbox=True,
@@ -82,10 +77,7 @@
8277
]
8378

8479
test_pipeline = [
85-
dict(
86-
type='LoadImageFromFile',
87-
file_client_args=file_client_args,
88-
color_type='color_ignore_orientation'),
80+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
8981
dict(type='Resize', scale=(1024, 640), keep_ratio=True),
9082
# add loading annotation after ``Resize`` because ground truth
9183
# does not need to do resize data transform

configs/textdet/fcenet/_base_fcenet_resnet50_fpn.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
file_client_args = dict(backend='disk')
2-
31
model = dict(
42
type='FCENet',
53
backbone=dict(
@@ -41,10 +39,7 @@
4139
pad_size_divisor=32))
4240

4341
train_pipeline = [
44-
dict(
45-
type='LoadImageFromFile',
46-
file_client_args=file_client_args,
47-
color_type='color_ignore_orientation'),
42+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
4843
dict(
4944
type='LoadOCRAnnotations',
5045
with_polygon=True,
@@ -96,10 +91,7 @@
9691
]
9792

9893
test_pipeline = [
99-
dict(
100-
type='LoadImageFromFile',
101-
file_client_args=file_client_args,
102-
color_type='color_ignore_orientation'),
94+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
10395
dict(type='Resize', scale=(2260, 2260), keep_ratio=True),
10496
# add loading annotation after ``Resize`` because ground truth
10597
# does not need to do resize data transform

configs/textdet/fcenet/fcenet_resnet50-dcnv2_fpn_1500e_ctw1500.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,13 @@
1212
dict(type='PolyLR', power=0.9, eta_min=1e-7, end=1500),
1313
]
1414

15-
file_client_args = dict(backend='disk')
1615
# dataset settings
1716
ctw1500_textdet_train = _base_.ctw1500_textdet_train
1817
ctw1500_textdet_test = _base_.ctw1500_textdet_test
1918

2019
# test pipeline for CTW1500
2120
ctw_test_pipeline = [
22-
dict(
23-
type='LoadImageFromFile',
24-
file_client_args=file_client_args,
25-
color_type='color_ignore_orientation'),
21+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
2622
dict(type='Resize', scale=(1080, 736), keep_ratio=True),
2723
# add loading annotation after ``Resize`` because ground truth
2824
# does not need to do resize data transform

configs/textdet/maskrcnn/_base_mask-rcnn_resnet50_fpn.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
_base_ = ['mmdet::_base_/models/mask-rcnn_r50_fpn.py']
22

3-
file_client_args = dict(backend='disk')
4-
53
mask_rcnn = _base_.pop('model')
64
# Adapt Mask R-CNN model to OCR task
75
mask_rcnn.update(
@@ -18,10 +16,7 @@
1816
model = dict(type='MMDetWrapper', text_repr_type='poly', cfg=mask_rcnn)
1917

2018
train_pipeline = [
21-
dict(
22-
type='LoadImageFromFile',
23-
file_client_args=file_client_args,
24-
color_type='color_ignore_orientation'),
19+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
2520
dict(
2621
type='LoadOCRAnnotations',
2722
with_polygon=True,
@@ -49,10 +44,7 @@
4944
]
5045

5146
test_pipeline = [
52-
dict(
53-
type='LoadImageFromFile',
54-
file_client_args=file_client_args,
55-
color_type='color_ignore_orientation'),
47+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
5648
dict(type='Resize', scale=(1920, 1920), keep_ratio=True),
5749
dict(
5850
type='LoadOCRAnnotations',

configs/textdet/maskrcnn/mask-rcnn_resnet50_fpn_160e_ctw1500.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020

2121
# test pipeline for CTW1500
2222
ctw_test_pipeline = [
23-
dict(
24-
type='LoadImageFromFile',
25-
file_client_args=dict(backend='disk'),
26-
color_type='color_ignore_orientation'),
23+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
2724
dict(type='Resize', scale=(1600, 1600), keep_ratio=True),
2825
# add loading annotation after ``Resize`` because ground truth
2926
# does not need to do resize data transform

configs/textdet/panet/_base_panet_resnet18_fpem-ffm.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@
3232
),
3333
postprocessor=dict(type='PANPostprocessor', text_repr_type='quad')))
3434

35-
file_client_args = dict(backend='disk')
3635
train_pipeline = [
37-
dict(
38-
type='LoadImageFromFile',
39-
file_client_args=file_client_args,
40-
color_type='color_ignore_orientation'),
36+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
4137
dict(
4238
type='LoadOCRAnnotations',
4339
with_polygon=True,
@@ -60,10 +56,7 @@
6056
]
6157

6258
test_pipeline = [
63-
dict(
64-
type='LoadImageFromFile',
65-
file_client_args=file_client_args,
66-
color_type='color_ignore_orientation'),
59+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
6760
# TODO Replace with mmcv.RescaleToShort when it's ready
6861
dict(
6962
type='ShortScaleAspectJitter',

configs/textdet/panet/panet_resnet18_fpem-ffm_600e_ctw1500.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,8 @@
99

1010
default_hooks = dict(checkpoint=dict(type='CheckpointHook', interval=20), )
1111

12-
file_client_args = dict(backend='disk')
1312
train_pipeline = [
14-
dict(
15-
type='LoadImageFromFile',
16-
file_client_args=file_client_args,
17-
color_type='color_ignore_orientation'),
13+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
1814
dict(
1915
type='LoadOCRAnnotations',
2016
with_polygon=True,
@@ -37,10 +33,7 @@
3733
]
3834

3935
test_pipeline = [
40-
dict(
41-
type='LoadImageFromFile',
42-
file_client_args=file_client_args,
43-
color_type='color_ignore_orientation'),
36+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
4437
# TODO Replace with mmcv.RescaleToShort when it's ready
4538
dict(
4639
type='ShortScaleAspectJitter',

configs/textdet/panet/panet_resnet50_fpem-ffm_600e_icdar2017.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@
77

88
default_hooks = dict(checkpoint=dict(type='CheckpointHook', interval=20), )
99

10-
file_client_args = dict(backend='disk')
1110
train_pipeline = [
12-
dict(
13-
type='LoadImageFromFile',
14-
file_client_args=file_client_args,
15-
color_type='color_ignore_orientation'),
11+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
1612
dict(
1713
type='LoadOCRAnnotations',
1814
with_polygon=True,
@@ -35,10 +31,7 @@
3531
]
3632

3733
test_pipeline = [
38-
dict(
39-
type='LoadImageFromFile',
40-
file_client_args=file_client_args,
41-
color_type='color_ignore_orientation'),
34+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
4235
# TODO Replace with mmcv.RescaleToShort when it's ready
4336
dict(
4437
type='ShortScaleAspectJitter',

configs/textdet/psenet/_base_psenet_resnet50_fpnf.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
file_client_args = dict(backend='disk')
2-
31
model = dict(
42
type='PSENet',
53
backbone=dict(
@@ -32,10 +30,7 @@
3230
pad_size_divisor=32))
3331

3432
train_pipeline = [
35-
dict(
36-
type='LoadImageFromFile',
37-
file_client_args=file_client_args,
38-
color_type='color_ignore_orientation'),
33+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
3934
dict(
4035
type='LoadOCRAnnotations',
4136
with_polygon=True,
@@ -58,10 +53,7 @@
5853
]
5954

6055
test_pipeline = [
61-
dict(
62-
type='LoadImageFromFile',
63-
file_client_args=file_client_args,
64-
color_type='color_ignore_orientation'),
56+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
6557
dict(type='Resize', scale=(2240, 2240), keep_ratio=True),
6658
dict(
6759
type='LoadOCRAnnotations',

configs/textdet/psenet/psenet_resnet50_fpnf_600e_ctw1500.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
ctw1500_textdet_test = _base_.ctw1500_textdet_test
1818

1919
test_pipeline_ctw = [
20-
dict(
21-
type='LoadImageFromFile',
22-
file_client_args=_base_.file_client_args,
23-
color_type='color_ignore_orientation'),
20+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
2421
dict(type='Resize', scale=(1280, 1280), keep_ratio=True),
2522
dict(
2623
type='LoadOCRAnnotations',

configs/textdet/textsnake/_base_textsnake_resnet50_fpn-unet.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
file_client_args = dict(backend='disk')
2-
31
model = dict(
42
type='TextSnake',
53
backbone=dict(
@@ -28,10 +26,7 @@
2826
pad_size_divisor=32))
2927

3028
train_pipeline = [
31-
dict(
32-
type='LoadImageFromFile',
33-
file_client_args=file_client_args,
34-
color_type='color_ignore_orientation'),
29+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
3530
dict(
3631
type='LoadOCRAnnotations',
3732
with_bbox=True,
@@ -72,10 +67,7 @@
7267
]
7368

7469
test_pipeline = [
75-
dict(
76-
type='LoadImageFromFile',
77-
file_client_args=file_client_args,
78-
color_type='color_ignore_orientation'),
70+
dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
7971
dict(type='Resize', scale=(1333, 736), keep_ratio=True),
8072
# add loading annotation after ``Resize`` because ground truth
8173
# does not need to do resize data transform

0 commit comments

Comments
 (0)