Merge 8398ff3 into 9cfa29f

open-mmlab · May 9, 2022 · 672f1f0 · 672f1f0
2 parents 9cfa29f + 8398ff3
commit 672f1f0
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 24 deletions.
diff --git a/configs/_base_/det_pipelines/dbnet_pipeline.py b/configs/_base_/det_pipelines/dbnet_pipeline.py
@@ -30,10 +30,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=(1333, 736),
+        img_scale=(1333, 736),  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(2944, 736), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),
@@ -76,10 +76,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=(4068, 1024),
+        img_scale=(4068, 1024),  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(2944, 736), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg_r50dcnv2),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),

diff --git a/configs/_base_/det_pipelines/drrg_pipeline.py b/configs/_base_/det_pipelines/drrg_pipeline.py
@@ -48,10 +48,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=(1024, 640),
+        img_scale=(1024, 640),  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(1024, 640), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),

diff --git a/configs/_base_/det_pipelines/fcenet_pipeline.py b/configs/_base_/det_pipelines/fcenet_pipeline.py
@@ -48,10 +48,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_icdar2015,
+        img_scale=img_scale_icdar2015,  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(1280, 800), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),
@@ -106,10 +106,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_ctw1500,
+        img_scale=img_scale_ctw1500,  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(1280, 800), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),

diff --git a/configs/_base_/det_pipelines/maskrcnn_pipeline.py b/configs/_base_/det_pipelines/maskrcnn_pipeline.py
@@ -28,7 +28,7 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_ctw1500,
+        img_scale=img_scale_ctw1500,  # used by Resize
         flip=False,
         transforms=[
             dict(type='Resize', keep_ratio=True),
@@ -45,7 +45,7 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_icdar2015,
+        img_scale=img_scale_icdar2015,  # used by Resize
         flip=False,
         transforms=[
             dict(type='Resize', keep_ratio=True),

diff --git a/configs/_base_/det_pipelines/panet_pipeline.py b/configs/_base_/det_pipelines/panet_pipeline.py
@@ -42,10 +42,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_test_ctw1500,
+        img_scale=img_scale_test_ctw1500,  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(3000, 640), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),
@@ -93,10 +93,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_test_icdar2015,
+        img_scale=img_scale_test_icdar2015,  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(3000, 640), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),
@@ -144,10 +144,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_test_icdar2017,
+        img_scale=img_scale_test_icdar2017,  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(3000, 640), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),

diff --git a/configs/_base_/det_pipelines/psenet_pipeline.py b/configs/_base_/det_pipelines/psenet_pipeline.py
@@ -41,10 +41,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_test_ctw1500,
+        img_scale=img_scale_test_ctw1500,  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(1280, 1280), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),
@@ -58,10 +58,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=img_scale_test_icdar2015,
+        img_scale=img_scale_test_icdar2015,  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(1280, 1280), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),

diff --git a/configs/_base_/det_pipelines/textsnake_pipeline.py b/configs/_base_/det_pipelines/textsnake_pipeline.py
@@ -53,10 +53,10 @@
     dict(type='LoadImageFromFile', color_type='color_ignore_orientation'),
     dict(
         type='MultiScaleFlipAug',
-        img_scale=(1333, 736),
+        img_scale=(1333, 736),  # used by Resize
         flip=False,
         transforms=[
-            dict(type='Resize', img_scale=(1333, 736), keep_ratio=True),
+            dict(type='Resize', keep_ratio=True),
             dict(type='Normalize', **img_norm_cfg),
             dict(type='Pad', size_divisor=32),
             dict(type='ImageToTensor', keys=['img']),