From 32c258ff19b1a0eae2986a3d2723fdf7345b2582 Mon Sep 17 00:00:00 2001 From: techmonsterwang <2959688260@qq.com> Date: Mon, 3 Apr 2023 21:22:43 +0800 Subject: [PATCH] update riformer mmpretrain --- .../imagenet_bs128_poolformer_medium_224.py | 2 +- .../imagenet_bs128_poolformer_small_224.py | 2 +- configs/riformer/metafile.yml | 66 +++++++++---------- mmpretrain/models/backbones/__init__.py | 2 +- model-index.yml | 1 + .../test_backbones/test_riformer.py | 1 - .../model_converters/reparameterize_model.py | 1 - 7 files changed, 36 insertions(+), 39 deletions(-) diff --git a/configs/_base_/datasets/imagenet_bs128_poolformer_medium_224.py b/configs/_base_/datasets/imagenet_bs128_poolformer_medium_224.py index 63d53d73..a48143cb 100644 --- a/configs/_base_/datasets/imagenet_bs128_poolformer_medium_224.py +++ b/configs/_base_/datasets/imagenet_bs128_poolformer_medium_224.py @@ -79,4 +79,4 @@ val_evaluator = dict(type='Accuracy', topk=(1, 5)) # If you want standard test, please manually configure the test dataset test_dataloader = val_dataloader -test_evaluator = val_evaluator \ No newline at end of file +test_evaluator = val_evaluator diff --git a/configs/_base_/datasets/imagenet_bs128_poolformer_small_224.py b/configs/_base_/datasets/imagenet_bs128_poolformer_small_224.py index 7047a919..a36b5afb 100644 --- a/configs/_base_/datasets/imagenet_bs128_poolformer_small_224.py +++ b/configs/_base_/datasets/imagenet_bs128_poolformer_small_224.py @@ -79,4 +79,4 @@ val_evaluator = dict(type='Accuracy', topk=(1, 5)) # If you want standard test, please manually configure the test dataset test_dataloader = val_dataloader -test_evaluator = val_evaluator \ No newline at end of file +test_evaluator = val_evaluator diff --git a/configs/riformer/metafile.yml b/configs/riformer/metafile.yml index 9f629fa6..db7b39d6 100644 --- a/configs/riformer/metafile.yml +++ b/configs/riformer/metafile.yml @@ -8,11 +8,11 @@ Collections: - LayerScale Paper: URL: https://arxiv.org/abs/xxxx.xxxxx - Title: RIFormer: Keep Your Vision Backbone Effective But Removing Token Mixer + Title: "RIFormer: Keep Your Vision Backbone Effective But Removing Token Mixer" README: configs/riformer/README.md Code: Version: v1.0.rc6 - URL: + URL: Models: - Name: riformer-s12_in1k @@ -26,11 +26,11 @@ Models: Top 1 Accuracy: 76.90 Top 5 Accuracy: 93.06 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-s12_32xb128_in1k.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-s24_in1k Metadata: Training Data: ImageNet-1k @@ -43,11 +43,11 @@ Models: Top 1 Accuracy: 80.28 Top 5 Accuracy: 94.80 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-s24_32xb128_in1k.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-s36_in1k Metadata: FLOPs: 5003000000 @@ -59,11 +59,11 @@ Models: Top 1 Accuracy: 81.29 Top 5 Accuracy: 95.41 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-s36_32xb128_in1k.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-m36_in1k Metadata: Training Data: ImageNet-1k @@ -76,11 +76,11 @@ Models: Top 1 Accuracy: 82.57 Top 5 Accuracy: 95.99 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-m36_32xb128_in1k.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-m48_in1k Metadata: FLOPs: 11590000000 @@ -92,11 +92,11 @@ Models: Top 1 Accuracy: 82.75 Top 5 Accuracy: 96.11 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-m48_32xb128_in1k.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-s12_384_in1k Metadata: FLOPs: 5355000000 @@ -108,11 +108,11 @@ Models: Top 1 Accuracy: 78.29 Top 5 Accuracy: 93.93 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-s12_32xb128_in1k_384.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-s24_384_in1k Metadata: Training Data: ImageNet-1k @@ -125,11 +125,11 @@ Models: Top 1 Accuracy: 81.36 Top 5 Accuracy: 95.40 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-s24_32xb128_in1k_384.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-s36_384_in1k Metadata: FLOPs: 14702000000 @@ -141,11 +141,11 @@ Models: Top 1 Accuracy: 82.22 Top 5 Accuracy: 95.95 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-s36_32xb128_in1k_384.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-m36_384_in1k Metadata: Training Data: ImageNet-1k @@ -158,11 +158,11 @@ Models: Top 1 Accuracy: 83.39 Top 5 Accuracy: 96.40 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-m36_32xb128_in1k_384.py Converted From: - Weights: - Code: + Weights: + Code: - Name: riformer-m48_384_in1k Metadata: FLOPs: 34060000000 @@ -174,10 +174,8 @@ Models: Top 1 Accuracy: 83.70 Top 5 Accuracy: 96.60 Task: Image Classification - Weights: + Weights: Config: configs/riformer/riformer-m48_32xb128_in1k_384.py Converted From: - Weights: - Code: - - + Weights: + Code: diff --git a/mmpretrain/models/backbones/__init__.py b/mmpretrain/models/backbones/__init__.py index 1ba680d6..5aa69c15 100644 --- a/mmpretrain/models/backbones/__init__.py +++ b/mmpretrain/models/backbones/__init__.py @@ -26,7 +26,6 @@ from .mobileone import MobileOne from .mobilevit import MobileViT from .mvit import MViT from .poolformer import PoolFormer -from .riformer import RIFormer from .regnet import RegNet from .replknet import RepLKNet from .repmlp import RepMLPNet @@ -37,6 +36,7 @@ from .resnet import ResNet, ResNetV1c, ResNetV1d from .resnet_cifar import ResNet_CIFAR from .resnext import ResNeXt from .revvit import RevVisionTransformer +from .riformer import RIFormer from .seresnet import SEResNet from .seresnext import SEResNeXt from .shufflenet_v1 import ShuffleNetV1 diff --git a/model-index.yml b/model-index.yml index defb42c1..fe3bbbad 100644 --- a/model-index.yml +++ b/model-index.yml @@ -29,6 +29,7 @@ Import: - configs/convmixer/metafile.yml - configs/densenet/metafile.yml - configs/poolformer/metafile.yml + - configs/riformer/metafile.yml - configs/inception_v3/metafile.yml - configs/mvit/metafile.yml - configs/edgenext/metafile.yml diff --git a/tests/test_models/test_backbones/test_riformer.py b/tests/test_models/test_backbones/test_riformer.py index 995dcbb5..86847ee0 100644 --- a/tests/test_models/test_backbones/test_riformer.py +++ b/tests/test_models/test_backbones/test_riformer.py @@ -122,7 +122,6 @@ class TestRIFormer(TestCase): torch.allclose(feats[i], feats_deploy[i]) torch.allclose(pred, pred_deploy) - def test_structure(self): # test drop_path_rate decay cfg = deepcopy(self.cfg) diff --git a/tools/model_converters/reparameterize_model.py b/tools/model_converters/reparameterize_model.py index fc04d16e..ad97e6e1 100644 --- a/tools/model_converters/reparameterize_model.py +++ b/tools/model_converters/reparameterize_model.py @@ -3,7 +3,6 @@ import argparse from pathlib import Path import torch - from mmcls.apis import init_model from mmcls.models.classifiers import ImageClassifier