From 6563f5f4480f8afa80339a3e5726224bd0364efb Mon Sep 17 00:00:00 2001 From: mzr1996 Date: Thu, 2 Jun 2022 17:10:14 +0800 Subject: [PATCH] Update autoaug and randaug configs --- configs/_base_/datasets/imagenet_bs128_mbv3.py | 4 +--- .../_base_/datasets/imagenet_bs128_poolformer_medium_224.py | 4 +--- .../_base_/datasets/imagenet_bs128_poolformer_small_224.py | 4 +--- configs/_base_/datasets/imagenet_bs256_rsb_a12.py | 4 +--- configs/_base_/datasets/imagenet_bs256_rsb_a3.py | 4 +--- configs/_base_/datasets/imagenet_bs64_autoaug.py | 4 +--- configs/_base_/datasets/imagenet_bs64_convmixer_224.py | 4 +--- configs/_base_/datasets/imagenet_bs64_pil_resize_autoaug.py | 4 +--- configs/_base_/datasets/imagenet_bs64_swin_224.py | 4 +--- configs/_base_/datasets/imagenet_bs64_t2t_224.py | 4 +--- configs/van/van-base_8xb128_in1k.py | 2 +- configs/van/van-large_8xb128_in1k.py | 2 +- configs/van/van-small_8xb128_in1k.py | 2 +- configs/van/van-tiny_8xb128_in1k.py | 2 +- 14 files changed, 14 insertions(+), 34 deletions(-) diff --git a/configs/_base_/datasets/imagenet_bs128_mbv3.py b/configs/_base_/datasets/imagenet_bs128_mbv3.py index 8514a511..403b69ce 100644 --- a/configs/_base_/datasets/imagenet_bs128_mbv3.py +++ b/configs/_base_/datasets/imagenet_bs128_mbv3.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/auto_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -19,7 +17,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='AutoAugment', - policies={{_base_.auto_increasing_policies}}, + policies='imagenet', hparams=dict(pad_val=[round(x) for x in bgr_mean])), dict( type='RandomErasing', diff --git a/configs/_base_/datasets/imagenet_bs128_poolformer_medium_224.py b/configs/_base_/datasets/imagenet_bs128_poolformer_medium_224.py index 3fbdf0e2..d19ab4f9 100644 --- a/configs/_base_/datasets/imagenet_bs128_poolformer_medium_224.py +++ b/configs/_base_/datasets/imagenet_bs128_poolformer_medium_224.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/rand_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -23,7 +21,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9, diff --git a/configs/_base_/datasets/imagenet_bs128_poolformer_small_224.py b/configs/_base_/datasets/imagenet_bs128_poolformer_small_224.py index b967a281..172e8e6b 100644 --- a/configs/_base_/datasets/imagenet_bs128_poolformer_small_224.py +++ b/configs/_base_/datasets/imagenet_bs128_poolformer_small_224.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/rand_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -23,7 +21,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9, diff --git a/configs/_base_/datasets/imagenet_bs256_rsb_a12.py b/configs/_base_/datasets/imagenet_bs256_rsb_a12.py index 52f049d2..263cd8e9 100644 --- a/configs/_base_/datasets/imagenet_bs256_rsb_a12.py +++ b/configs/_base_/datasets/imagenet_bs256_rsb_a12.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/rand_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -23,7 +21,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=7, diff --git a/configs/_base_/datasets/imagenet_bs256_rsb_a3.py b/configs/_base_/datasets/imagenet_bs256_rsb_a3.py index 59f939c9..1d3f4b68 100644 --- a/configs/_base_/datasets/imagenet_bs256_rsb_a3.py +++ b/configs/_base_/datasets/imagenet_bs256_rsb_a3.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/rand_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -23,7 +21,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=6, diff --git a/configs/_base_/datasets/imagenet_bs64_autoaug.py b/configs/_base_/datasets/imagenet_bs64_autoaug.py index 4840e54a..c0d79814 100644 --- a/configs/_base_/datasets/imagenet_bs64_autoaug.py +++ b/configs/_base_/datasets/imagenet_bs64_autoaug.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/auto_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -19,7 +17,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='AutoAugment', - policies={{_base_.auto_increasing_policies}}, + policies='imagenet', hparams=dict( pad_val=[round(x) for x in bgr_mean], interpolation='bicubic')), dict(type='PackClsInputs'), diff --git a/configs/_base_/datasets/imagenet_bs64_convmixer_224.py b/configs/_base_/datasets/imagenet_bs64_convmixer_224.py index 13d0a475..b027994e 100644 --- a/configs/_base_/datasets/imagenet_bs64_convmixer_224.py +++ b/configs/_base_/datasets/imagenet_bs64_convmixer_224.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/rand_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -23,7 +21,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9, diff --git a/configs/_base_/datasets/imagenet_bs64_pil_resize_autoaug.py b/configs/_base_/datasets/imagenet_bs64_pil_resize_autoaug.py index 0158186d..58686b37 100644 --- a/configs/_base_/datasets/imagenet_bs64_pil_resize_autoaug.py +++ b/configs/_base_/datasets/imagenet_bs64_pil_resize_autoaug.py @@ -1,5 +1,3 @@ -_base_ = ['pipelines/auto_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -23,7 +21,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='AutoAugment', - policies={{_base_.policy_imagenet}}, + policies='imagenet', hparams=dict( pad_val=[round(x) for x in bgr_mean], interpolation='bicubic')), dict(type='PackClsInputs'), diff --git a/configs/_base_/datasets/imagenet_bs64_swin_224.py b/configs/_base_/datasets/imagenet_bs64_swin_224.py index 77e77fe7..11dab555 100644 --- a/configs/_base_/datasets/imagenet_bs64_swin_224.py +++ b/configs/_base_/datasets/imagenet_bs64_swin_224.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/rand_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -23,7 +21,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9, diff --git a/configs/_base_/datasets/imagenet_bs64_t2t_224.py b/configs/_base_/datasets/imagenet_bs64_t2t_224.py index 086e6305..199095db 100644 --- a/configs/_base_/datasets/imagenet_bs64_t2t_224.py +++ b/configs/_base_/datasets/imagenet_bs64_t2t_224.py @@ -1,5 +1,3 @@ -_base_ = ['./pipelines/rand_aug.py'] - # dataset settings dataset_type = 'ImageNet' preprocess_cfg = dict( @@ -23,7 +21,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9, diff --git a/configs/van/van-base_8xb128_in1k.py b/configs/van/van-base_8xb128_in1k.py index fe88ac58..3099dc37 100644 --- a/configs/van/van-base_8xb128_in1k.py +++ b/configs/van/van-base_8xb128_in1k.py @@ -26,7 +26,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9, diff --git a/configs/van/van-large_8xb128_in1k.py b/configs/van/van-large_8xb128_in1k.py index a0adebdd..a843b732 100644 --- a/configs/van/van-large_8xb128_in1k.py +++ b/configs/van/van-large_8xb128_in1k.py @@ -26,7 +26,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9, diff --git a/configs/van/van-small_8xb128_in1k.py b/configs/van/van-small_8xb128_in1k.py index b6f66742..04322ae7 100644 --- a/configs/van/van-small_8xb128_in1k.py +++ b/configs/van/van-small_8xb128_in1k.py @@ -26,7 +26,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9, diff --git a/configs/van/van-tiny_8xb128_in1k.py b/configs/van/van-tiny_8xb128_in1k.py index 6e5132f9..1d2d799e 100644 --- a/configs/van/van-tiny_8xb128_in1k.py +++ b/configs/van/van-tiny_8xb128_in1k.py @@ -26,7 +26,7 @@ train_pipeline = [ dict(type='RandomFlip', prob=0.5, direction='horizontal'), dict( type='RandAugment', - policies={{_base_.rand_increasing_policies}}, + policies='timm_increasing', num_policies=2, total_level=10, magnitude_level=9,