Merge c504704 into 6736d14

.dev_scripts/test_benchmark.py

@@ -163,6 +163,7 @@ def create_test_job_batch(commands, model_info, args, port, script_name):
                   f'#SBATCH --ntasks=2\n'
                   f'#SBATCH --cpus-per-task=16\n\n'
                   f'export MASTER_PORT={port}\n'
+                  f'export CUBLAS_WORKSPACE_CONFIG=:4096:8\n'
                   f'{runner} -u {script_name} {config} {checkpoint} '
                   f'--work-dir={work_dir} '
                   f'--out={result_file} '

.gitignore

@@ -47,6 +47,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+tests/data/out
 
 # Translations
 *.mo

configs/_base_/datasets/basicvsr_test_config.py

@@ -163,7 +163,7 @@
 ]
 
 # config for test
-test_cfg = dict(type='MultiTestLoop')
+test_cfg = dict(type='EditTestLoop')
 test_dataloader = [
     reds_dataloader,
     vimeo_90k_bd_dataloader,

configs/_base_/datasets/cifar10_nopad.py

@@ -1,5 +1,5 @@
 cifar_pipeline = [
-    dict(type='Flip', keys=['img'], flip_ratio=0.5, direction='horizontal'),
+    dict(type='Flip', keys=['gt'], flip_ratio=0.5, direction='horizontal'),
     dict(type='PackEditInputs')
 ]
 cifar_dataset = dict(
@@ -9,6 +9,15 @@
     test_mode=False,
     pipeline=cifar_pipeline)
 
+# test dataset do not use flip
+cifar_pipeline_test = [dict(type='PackEditInputs')]
+cifar_dataset_test = dict(
+    type='CIFAR10',
+    data_root='./data',
+    data_prefix='cifar10',
+    test_mode=False,
+    pipeline=cifar_pipeline_test)
+
 train_dataloader = dict(
     num_workers=2,
     dataset=cifar_dataset,
@@ -18,13 +27,13 @@
 val_dataloader = dict(
     batch_size=32,
     num_workers=2,
-    dataset=cifar_dataset,
+    dataset=cifar_dataset_test,
     sampler=dict(type='DefaultSampler', shuffle=False),
     persistent_workers=True)
 
 test_dataloader = dict(
     batch_size=32,
     num_workers=2,
-    dataset=cifar_dataset,
+    dataset=cifar_dataset_test,
     sampler=dict(type='DefaultSampler', shuffle=False),
     persistent_workers=True)

configs/_base_/datasets/comp1k.py

@@ -29,6 +29,7 @@
 
 test_dataloader = val_dataloader
 
+# TODO: matting
 val_evaluator = [
     dict(type='SAD'),
     dict(type='MattingMSE'),

configs/_base_/datasets/ffhq_flip.py

@@ -1,14 +1,14 @@
 dataset_type = 'BasicImageDataset'
 
 train_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='Flip', keys=['img'], direction='horizontal'),
-    dict(type='PackEditInputs', keys='img')
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='Flip', keys=['gt'], direction='horizontal'),
+    dict(type='PackEditInputs', keys='gt')
 ]
 
 val_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='PackEditInputs', keys=['img'])
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='PackEditInputs', keys=['gt'])
 ]
 
 # `batch_size` and `data_root` need to be set.
@@ -19,6 +19,7 @@
     sampler=dict(type='InfiniteSampler', shuffle=True),
     dataset=dict(
         type=dataset_type,
+        data_prefix=dict(gt=''),
         data_root=None,  # set by user
         pipeline=train_pipeline))
 
@@ -27,6 +28,7 @@
     num_workers=8,
     dataset=dict(
         type=dataset_type,
+        data_prefix=dict(gt=''),
         data_root=None,  # set by user
         pipeline=val_pipeline),
     sampler=dict(type='DefaultSampler', shuffle=False),
@@ -37,6 +39,7 @@
     num_workers=8,
     dataset=dict(
         type=dataset_type,
+        data_prefix=dict(gt=''),
         data_root=None,  # set by user
         pipeline=val_pipeline),
     sampler=dict(type='DefaultSampler', shuffle=False),

configs/_base_/datasets/grow_scale_imgs_ffhq_styleganv1.py

@@ -1,8 +1,8 @@
 dataset_type = 'GrowScaleImgDataset'
 
 pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='Flip', keys=['img'], direction='horizontal'),
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='Flip', keys='gt', direction='horizontal'),
     dict(type='PackEditInputs')
 ]
 
@@ -37,6 +37,7 @@
     batch_size=64,
     dataset=dict(
         type='BasicImageDataset',
+        data_prefix=dict(gt=''),
         pipeline=pipeline,
         data_root='./data/ffhq/images'),
     sampler=dict(type='DefaultSampler', shuffle=False))

configs/_base_/datasets/imagenet_128.py

@@ -4,17 +4,17 @@
 # different from mmcls, we adopt the setting used in BigGAN.
 # We use `RandomCropLongEdge` in training and `CenterCropLongEdge` in testing.
 train_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='RandomCropLongEdge', keys=['img']),
-    dict(type='Resize', scale=(128, 128), keys=['img'], backend='pillow'),
-    dict(type='Flip', keys=['img'], flip_ratio=0.5, direction='horizontal'),
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='RandomCropLongEdge', keys='gt'),
+    dict(type='Resize', scale=(128, 128), keys='gt', backend='pillow'),
+    dict(type='Flip', keys='gt', flip_ratio=0.5, direction='horizontal'),
     dict(type='PackEditInputs')
 ]
 
 test_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='CenterCropLongEdge', keys=['img']),
-    dict(type='Resize', scale=(128, 128), backend='pillow'),
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='CenterCropLongEdge', keys='gt'),
+    dict(type='Resize', scale=(128, 128), keys='gt', backend='pillow'),
     dict(type='PackEditInputs')
 ]
 

configs/_base_/datasets/imagenet_512.py

@@ -4,17 +4,17 @@
 # different from mmcls, we adopt the setting used in BigGAN.
 # We use `RandomCropLongEdge` in training and `CenterCropLongEdge` in testing.
 train_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='RandomCropLongEdge', keys=['img']),
-    dict(type='Resize', scale=(512, 512), keys=['img'], backend='pillow'),
-    dict(type='Flip', keys=['img'], flip_ratio=0.5, direction='horizontal'),
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='RandomCropLongEdge', keys='gt'),
+    dict(type='Resize', scale=(512, 512), keys='gt', backend='pillow'),
+    dict(type='Flip', keys='gt', flip_ratio=0.5, direction='horizontal'),
     dict(type='PackEditInputs')
 ]
 
 test_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='CenterCropLongEdge', keys=['img']),
-    dict(type='Resize', scale=(512, 512), backend='pillow'),
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='CenterCropLongEdge', keys='gt'),
+    dict(type='Resize', scale=(512, 512), keys='gt', backend='pillow'),
     dict(type='PackEditInputs')
 ]
 

configs/_base_/datasets/imagenet_64.py

@@ -4,17 +4,17 @@
 # different from mmcls, we adopt the setting used in BigGAN.
 # We use `RandomCropLongEdge` in training and `CenterCropLongEdge` in testing.
 train_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='RandomCropLongEdge', keys=['img']),
-    dict(type='Resize', scale=(64, 64), keys=['img'], backend='pillow'),
-    dict(type='Flip', keys=['img'], flip_ratio=0.5, direction='horizontal'),
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='RandomCropLongEdge', keys='gt'),
+    dict(type='Resize', scale=(64, 64), keys='gt', backend='pillow'),
+    dict(type='Flip', keys='gt', flip_ratio=0.5, direction='horizontal'),
     dict(type='PackEditInputs')
 ]
 
 test_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
-    dict(type='CenterCropLongEdge', keys=['img']),
-    dict(type='Resize', scale=(64, 64), backend='pillow'),
+    dict(type='LoadImageFromFile', key='gt'),
+    dict(type='CenterCropLongEdge', keys='gt'),
+    dict(type='Resize', scale=(64, 64), keys='gt', backend='pillow'),
     dict(type='PackEditInputs')
 ]
 

configs/_base_/datasets/liif_test_config.py

@@ -1,4 +1,3 @@
-# scale_test = 3
 scale_test_list = [2, 3, 4, 6, 18, 30]
 
 test_pipelines = [[
@@ -74,7 +73,7 @@
 ] for scale in scale_test_list]
 
 # test config
-test_cfg = dict(type='MultiTestLoop')
+test_cfg = dict(type='EditTestLoop')
 test_dataloader = [
     *set5_dataloaders,
     *set14_dataloaders,

configs/_base_/datasets/lsun_stylegan.py

@@ -1,12 +1,12 @@
 dataset_type = 'BasicImageDataset'
 
 train_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
+    dict(type='LoadImageFromFile', key='gt'),
     dict(type='PackEditInputs')
 ]
 
 val_pipeline = [
-    dict(type='LoadImageFromFile', key='img'),
+    dict(type='LoadImageFromFile', key='gt'),
     dict(type='PackEditInputs')
 ]
 
@@ -18,6 +18,7 @@
     sampler=dict(type='InfiniteSampler', shuffle=True),
     dataset=dict(
         type=dataset_type,
+        data_prefix=dict(gt=''),
         data_root=None,  # set by user
         pipeline=train_pipeline))
 
@@ -26,6 +27,7 @@
     num_workers=8,
     dataset=dict(
         type=dataset_type,
+        data_prefix=dict(gt=''),
         data_root=None,  # set by user
         pipeline=val_pipeline),
     sampler=dict(type='DefaultSampler', shuffle=False),
@@ -36,6 +38,7 @@
     num_workers=8,
     dataset=dict(
         type=dataset_type,
+        data_prefix=dict(gt=''),
         data_root=None,  # set by user
         pipeline=val_pipeline),
     sampler=dict(type='DefaultSampler', shuffle=False),

configs/_base_/datasets/paired_imgs_256x256_crop.py

@@ -29,7 +29,8 @@
     #     }),
     # dict(
     #     type='PackEditInputs',
-    #     keys=[f'img_{domain_a}', f'img_{domain_b}'],)
+    #     keys=[f'img_{domain_a}', f'img_{domain_b}'],
+    #     data_keys=[f'img_{domain_a}', f'img_{domain_b}'])
 ]
 
 test_pipeline = [
@@ -64,7 +65,8 @@
     #     }),
     # dict(
     #     type='PackEditInputs',
-    #     keys=[f'img_{domain_a}', f'img_{domain_b}'],)
+    #     keys=[f'img_{domain_a}', f'img_{domain_b}'],
+    #     data_keys=[f'img_{domain_a}', f'img_{domain_b}'])
 ]
 
 # `batch_size` and `data_root` need to be set.

configs/_base_/datasets/sisr_x2_test_config.py

@@ -27,10 +27,12 @@
         data_root=set5_data_root,
         data_prefix=dict(img='LRbicx2', gt='GTmod12'),
         pipeline=test_pipeline))
-set5_evaluator = [
-    dict(type='PSNR', crop_border=2, prefix='Set5'),
-    dict(type='SSIM', crop_border=2, prefix='Set5'),
-]
+set5_evaluator = dict(
+    type='EditEvaluator',
+    metrics=[
+        dict(type='PSNR', crop_border=2, prefix='Set5'),
+        dict(type='SSIM', crop_border=2, prefix='Set5'),
+    ])
 
 set14_data_root = 'data/Set14'
 set14_dataloader = dict(
@@ -44,10 +46,12 @@
         data_root=set14_data_root,
         data_prefix=dict(img='LRbicx2', gt='GTmod12'),
         pipeline=test_pipeline))
-set14_evaluator = [
-    dict(type='PSNR', crop_border=2, prefix='Set14'),
-    dict(type='SSIM', crop_border=2, prefix='Set14'),
-]
+set14_evaluator = dict(
+    type='EditEvaluator',
+    metrics=[
+        dict(type='PSNR', crop_border=2, prefix='Set14'),
+        dict(type='SSIM', crop_border=2, prefix='Set14'),
+    ])
 
 # test config for DIV2K
 div2k_data_root = 'data/DIV2K'
@@ -62,18 +66,18 @@
         ann_file='meta_info_DIV2K100sub_GT.txt',
         metainfo=dict(dataset_type='div2k', task_name='sisr'),
         data_root=div2k_data_root,
-        # TODO: what this"
         data_prefix=dict(
             img='DIV2K_train_LR_bicubic/X2_sub', gt='DIV2K_train_HR_sub'),
-        # filename_tmpl=dict(img='{}_x2', gt='{}'),
         pipeline=test_pipeline))
-div2k_evaluator = [
-    dict(type='PSNR', crop_border=2, prefix='DIV2K'),
-    dict(type='SSIM', crop_border=2, prefix='DIV2K'),
-]
+div2k_evaluator = dict(
+    type='EditEvaluator',
+    metrics=[
+        dict(type='PSNR', crop_border=2, prefix='DIV2K'),
+        dict(type='SSIM', crop_border=2, prefix='DIV2K'),
+    ])
 
 # test config
-test_cfg = dict(type='MultiTestLoop')
+test_cfg = dict(type='EditTestLoop')
 test_dataloader = [
     set5_dataloader,
     set14_dataloader,

configs/_base_/datasets/sisr_x3_test_config.py

@@ -27,10 +27,12 @@
         data_root=set5_data_root,
         data_prefix=dict(img='LRbicx3', gt='GTmod12'),
         pipeline=test_pipeline))
-set5_evaluator = [
-    dict(type='PSNR', crop_border=3, prefix='Set5'),
-    dict(type='SSIM', crop_border=3, prefix='Set5'),
-]
+set5_evaluator = dict(
+    type='EditEvaluator',
+    metrics=[
+        dict(type='PSNR', crop_border=3, prefix='Set5'),
+        dict(type='SSIM', crop_border=3, prefix='Set5'),
+    ])
 
 set14_data_root = 'data/Set14'
 set14_dataloader = dict(
@@ -44,10 +46,12 @@
         data_root=set14_data_root,
         data_prefix=dict(img='LRbicx3', gt='GTmod12'),
         pipeline=test_pipeline))
-set14_evaluator = [
-    dict(type='PSNR', crop_border=3, prefix='Set14'),
-    dict(type='SSIM', crop_border=3, prefix='Set14'),
-]
+set14_evaluator = dict(
+    type='EditEvaluator',
+    metrics=[
+        dict(type='PSNR', crop_border=3, prefix='Set14'),
+        dict(type='SSIM', crop_border=3, prefix='Set14'),
+    ])
 
 # test config for DIV2K
 div2k_data_root = 'data/DIV2K'
@@ -64,13 +68,15 @@
         data_prefix=dict(
             img='DIV2K_train_LR_bicubic/X3_sub', gt='DIV2K_train_HR_sub'),
         pipeline=test_pipeline))
-div2k_evaluator = [
-    dict(type='PSNR', crop_border=3, prefix='DIV2K'),
-    dict(type='SSIM', crop_border=3, prefix='DIV2K'),
-]
+div2k_evaluator = dict(
+    type='EditEvaluator',
+    metrics=[
+        dict(type='PSNR', crop_border=3, prefix='DIV2K'),
+        dict(type='SSIM', crop_border=3, prefix='DIV2K'),
+    ])
 
 # test config
-test_cfg = dict(type='MultiTestLoop')
+test_cfg = dict(type='EditTestLoop')
 test_dataloader = [
     set5_dataloader,
     set14_dataloader,