Commit Graph

105 Commits (c92eefbb4a767d6bda1340daadb16d79ac2d00ef)

Author SHA1 Message Date
Ma Zerun 15cd34bbef
[Fix] Use zero as default value of `thrs` in metrics. (#341)
* Use zero as default value of `thrs` in metrics. And it accepcts a number
instead of float now.

* Fix unit test comment

* Don't pass thrs if no thrs.
2021-07-18 16:57:21 +08:00
Ma Zerun 1a7cebe4b9
[Refactor] Refactor unittest (#321)
* Refactor unit tests folder structure.

* Remove label smooth and Vit test in `test_classifiers.py`

* Rename test_utils in dataset to test_dataset_utils

* Split test_models/test_utils/test_utils.py to multiple sub files.

* Add unit tests of classifiers and heads

* Use patch context manager.

* Add unit test of `is_tracing`, and add warning in `is_tracing` if torch
verison is smaller than 1.6.0
2021-07-08 22:49:05 +08:00
Wenwei Zhang 06f415c28a
support to test mmdet inference with mmcls backbone (#343)
* support to test mmdet inference with mmcls backbone

* update config

* update

* add mmdet dependency in tests
2021-07-06 14:34:12 +08:00
Ma Zerun 076ee10cac
[Feature] Add swin-transformer model. (#271)
* Add swin transformer archs S, B and L.

* Add SwinTransformer configs

* Add train config files of swin.

* Align init method with original code

* Use nn.Unfold to merge patch

* Change all ConfigDict to dict

* Add init_cfg for all subclasses of BaseModule.

* Use mmcv version init function

* Add Swin README

* Use safer cfg copy method

* Improve docstring and variable name.

* Fix some difference in randaug

Fix BGR bug, align scheduler config.

Fix label smoothing parameter difference.

* Fix missing droppath in attn

* Fix bug of relative posititon table if window width is not equal to
height.

* Make `PatchMerging` more general, support kernel, stride, padding and
dilation.

* Rename `residual` to `identity` in attention and FFN.

* Add `auto_pad` option to auto pad feature map

* Improve docstring.

* Fix bug in ShiftWMSA padding.

* Remove unused `key` and `value` in ShiftWMSA

* Move `PatchMerging` into utils and use common `PatchEmbed`.

* Use latest `LinearClsHead`, train augments and label smooth settings.
And remove original `SwinLinearClsHead`.

* Mark some configs as "Evalution Only".

* Remove useless comment in config

* 1. Move ShiftWindowMSA and WindowMSA to `utils/attention.py`
2. Add docstrings of each module.
3. Fix some variables' names.
4. Other small improvement.

* Add unit tests of swin-transformer and patchmerging.

* Fix some bugs in unit tests.

* Fix bug of rel_position_index if window is not square.

* Make WindowMSA implicit, and add unit tests.

* Add metafile.yml, update readme and model_zoo.
2021-07-01 09:30:42 +08:00
whcao bee0ac6b56
[Refactor]Modify patchembed (#330)
* add mytrain.py for test

* test before layers

* test attr in layers

* test classifier

* delete mytrain.py

* add patchembed and hybridembed

* add patchembed and hybridembed to __init__

* test patchembed and hybridembed

* fix some comments
2021-06-30 20:48:04 +08:00
Ma Zerun 65410b05ad
Fix Mobilenetv3 structure and add pretrained model (#291)
* Refactor Mobilenetv3 structure and add ConvClsHead.

* Change model's name from 'MobileNetv3' to 'MobileNetV3'

* Modify configs for MobileNetV3 on CIFAR10.

And add MobileNetV3 configs for imagenet

* Fix activate setting bugs in MobileNetV3.

And remove bias in SELayer.

* Modify unittest

* Remove useless config and file.

* Fix mobilenetv3-large arch setting

* Add dropout option in ConvClsHead

* Fix MobilenetV3 structure according to torchvision version.

1. Remove with_expand_conv option in InvertedResidual, it should be decided by channels.

2. Revert activation function, should before SE layer.

* Format code.

* Rename MobilenetV3 arch "big" to "large".

* Add mobilenetv3_small torchvision training recipe

* Modify default `out_indices` of MobilenetV3, now it will change
according to `arch` if not specified.

* Add MobilenetV3 large config.

* Add mobilenetv3 README

* Modify InvertedResidual unit test.

* Refactor ConvClsHead to StackedLinearClsHead, and add unit tests.

* Add unit test for `simple_test` of `StackedLinearClsHead`.

* Fix typo

Co-authored-by: Yidi Shao <ydshao@smail.nju.edu.cn>
2021-06-27 23:19:36 +08:00
Ma Zerun 53c0df271f
Fix magnitude_std bug in RandAugment, and update unit tests. (#309) 2021-06-21 11:25:11 +08:00
whcao 3a08db9182
[Feature]Add augments to models/utils (#278)
* add mytrain.py for test

* test before layers

* test attr in layers

* test classifier

* delete mytrain.py

* add rand_bbox_minmax rand_bbox and cutmix_bbox_and_lam to BaseCutMixLayer

* add mixup_prob to BatchMixupLayer

* add cutmixup

* add cutmixup to __init__

* test classifier with cutmixup

* delete some comments

* set mixup_prob default to 1.0

* add cutmixup to classifier

* use cutmixup

* use cutmixup

* fix bugs

* test cutmixup

* move mixup and cutmix to augment

* inherit from BaseAugment

* add BaseAugment

* inherit from BaseAugment

* rename identity.py

* add @

* build augment

* register module

* rename to augment.py

* delete cutmixup.py

* do not inherit from BaseAugment

* add augments

* use augments in classifier

* prob default to 1.0

* add comments

* use augments

* use augments

* assert sum of augmentation probabilities should equal to 1

* augmentation probabilities equal to 1

* calculate Identity prob

* replace xxx with self.xxx

* add comments

* sync with augments

* for BC-breaking

* delete useless comments in mixup.py
2021-06-20 09:44:51 +08:00
Ma Zerun 84a939f858
Refactor LabelSmoothLoss (#285)
* Refector label smooth loss, now support mode `original`, `classy_vision`
and `multi_label`.

* Add unittests for label smooth loss.

* Improve docstring of LSR
2021-06-12 21:32:18 +08:00
Miao Zheng 4ca21c7d03
[WIP] Refactoring weights initialization (#270)
* [WIP] Refactoring weights initialization

* fix lint and constant init cfg

* fix pretrained bug

* fix typo

* fix isort

* revise model utils
2021-06-10 10:54:34 +08:00
LXXXXR 2c9e12f850
[Feature] Add an argument `efficientnet_style` to `RandomResizedCrop` and `CenterCrop` (#268)
* add config for resnest test

* fix config

* add label smoothing

* add memcached

* minor fix

* fix bug

* fix config

* add config

* minor fix

* fix configs

* use EResize

* change interpolation

* add more configs

* add docsting

* add unittest

* remove unnecessary changes

* minor fix

* add more docstring

* fix linting

* refactor

* add resize in crop to ensure crop size is output size

* fix bug and add comments

* fix bug
2021-05-31 14:10:57 +08:00
Ma Zerun 09597e5a4c
Add transform `RandomErasing` (#248)
* Add transform `RandomErasing`.

* Add unittests of `RandomErasing`

* Fix typo in docstring

* Improve docstring and unittests.
2021-05-19 22:35:26 +08:00
LXXXXR 8c90a879ce
[Fix] Fix magnitude_range in RandAug (#249)
* add increasing in solarize and posterize

* fix linting

* Revert "add increasing in solarize and posterize"

This reverts commit 128af36e9b.

* revise according to comments
2021-05-12 15:21:55 +08:00
mzr1996 a3b8d6015d
[Feature] Add RandAUG magnitude noise (#240)
* Add paramater magnitude_std in RandAugment to allow randomly movement of magnitude_value

* Add unittest for magnitude_std

* Improve docstring of magnitude_std
2021-05-10 17:13:41 +08:00
RangiLyu 6a50a2864b
fix typo in unit test (#238) 2021-05-10 15:03:39 +08:00
mzr1996 8128900a12
GlabelAveragePooling support 1d, 2d and 3d by param, and add neck test (#236)
* GlabelAveragePooling support 1d, 2d and 3d by param, and add neck test

* Imporve neck test

* Change 'mode' attribute in GAP to 'dim', and add docstring
2021-05-10 15:00:50 +08:00
whcao b30f79ea4c
[Feature]Modify Parameters Passing in models.heads (#239)
* add mytrain.py for test

* test before layers

* test attr in layers

* test classifier

* delete mytrain.py

* set cal_acc in ClsHead defaults to False

* set cal_acc defaults to False

* use *args, **kwargs instead

* change bs16 to 3 in test_image_classifier_vit

* fix some comments

* change cal_acc=True

* test LinearClsHead
2021-05-10 14:56:55 +08:00
whcao affb39fe07
[Feature]Add Vit (#214)
* add imagenet bs 4096

* add vit_base_patch16_224_finetune

* add vit_base_patch16_224_pretrain

* add vit_base_patch16_384_finetune

* add vit_base_patch16_384_finetune

* add vit_b_p16_224_finetune_imagenet

* add vit_b_p16_224_pretrain_imagenet

* add vit_b_p16_384_finetune_imagenet

* add vit

* add vit

* add vit head

* vit unitest

* keep up with ClsHead

* test vit

* add flag to determiine whether to calculate acc during training

* Changes related to mmcv1.3.0

* change checkpoint saving interval to 10

* add label smooth

* default_runtime.py recovery

* docformatter

* docformatter

* delete 2 lines of comments

* delete configs/_base_/schedules/imagenet_bs4096.py

* add configs/_base_/schedules/imagenet_bs2048_AdamW.py

* rename imagenet_bs4096.py to imagenet_bs2048_AdamW.py

* add helpers.py

* test vit hybrid backbone

* fix HybridEmbed

* use to_2tuple instead
2021-04-16 19:22:41 +08:00
whcao 1cde6f6e65
[Feature] Add cutmix option (#198)
* Add cutmix option

* fix code style

* add some annotations

* add annotation about custom_hooks

* check constraint of alpha > 0

* add test cutmix

* fix code style

* add cutmix to configs/models

* add cutmix to configs/resnet

* flake8

* empty
2021-04-14 21:27:42 +08:00
mzr1996 b7b520881f
Update CONTRIBUTING.md according to mmcv (#210)
* Update CONTRIBUTING.md according to mmcv

* Docstring formatting by docformatter

* Update openmmlab website.
2021-04-14 21:22:37 +08:00
whcao af83e981ac
[Bug]Fix label smooth bug (#203)
* add convert_to_one_hot

* add test_label_smooth_loss

* add my label_smooth_loss

* fix CELoss bug

* test new label smooth loss

* LabelSmoothLoss downward compatibility

* add some comments

* remove the old version of LabelSmoothLoss

* add some comments

* add some comments

* add some comments

* add label smooth to config
2021-04-13 13:53:56 +08:00
whcao dcf61173f6
[Feature]Add cal_acc to cls_head.py (#206)
* add cal_acc to cls_head.py

* test ClsHead with cal_acc

* 4 spaces indentation
2021-04-13 13:52:14 +08:00
LXXXXR 5195932952
[Feature] Support random augmentation (#201)
* support random augmentation

* minor fix on posterize

* minor fix on posterize

* minor fix on cutout

* minor fix on cutout

* fix bug in solarize add

* revised according to comments
2021-04-09 14:02:50 +08:00
LXXXXR 4d1fb1a662
[Feature] ColorJitter and Lighting (#190)
* add configs

* remove config

* add color jitter and lighting

* revised according to comments
2021-04-02 19:23:39 +08:00
LXXXXR 93cd960466
[Feature] Support AutoAug, AutoContrast, Equalize, Contrast, Brightness and Sharpness (#179)
* add AutoContrast, Equalize, Contrast, Brightness and Sharpness pipelines

* add ImageNetPolicy

* add configs

* add unittest

* remove config

* rerun CI

* rerun CI

* [Fix] Update pip install mmcv command in ci (#187)

* update pip install mmcv command in ci

* update pip install mmcv command in ci

* fix ci

* fix ci
2021-03-30 15:38:55 +08:00
LXXXXR b507fc207b
[Fix] Use MMCV's EvalHook in MMClassification (#182)
* use eval_hook in mmcv

* minor fix
2021-03-25 17:38:51 +08:00
LXXXXR f3b9380cbc
[Feature] Support solarize and posterize pipelines (#172)
* support Solarize and Posterize

* revised according to comments

* fix conflicts
2021-03-09 19:45:13 +08:00
LXXXXR 9614787fc4
[Feature] Add color pipeline (#171)
* add ColorTransform pipeline

* fix docstring

* minor change

* revised according to comments
2021-03-09 19:28:50 +08:00
LXXXXR c8033ece8e
add invert pipeline (#168) 2021-03-02 16:46:57 +08:00
LXXXXR b1fa298a66
add Rotate pipeline (#167) 2021-03-01 21:49:07 +08:00
LXXXXR bc50a7927b
reslove conflicts (#165) 2021-02-26 11:48:13 +08:00
LXXXXR 8c11c01fdb
[Feature] Add shear pipeline (#163)
* half-done auto_augmentation

* remove auto_augcode and support shear pipeline

* fix typo

* fix typo

* use a non-square toy data instead
2021-02-25 16:00:46 +08:00
David de la Iglesia Castro fb11a23cfe
Show results in test api (#162)
* Initial support show in single_gpu_test

* Add result_show

* Add ori_filename meta_key

* test ori_filename

* Add show, show-dir, show-options
2021-02-25 16:00:22 +08:00
ftbabi bdd6b01ae7
[Feature] Add "mixup" from Bag of Tricks (#160)
* Add mixup option

* Modify the structure of mixup and add configs

* Clean configs

* Add test for mixup and SoftCrossEntropyLoss

* Add simple test for ImageClassifier

* Fix bug in test_losses.py

* Add assertion in CrossEntropyLoss
2021-02-25 14:06:58 +08:00
LXXXXR fc82c31b2f
fix RandomCrop and RandomResizedCrop (#151) 2021-01-25 20:28:16 +08:00
LXXXXR 07bb15e5fd
[Feature] Add heads and config for multilabel task (#145)
* resolve conflicts
add heads and config for multilabel tasks

* minor change

* remove evaluating mAP in head

* add baseline config

* add configs

* reserve only one config

* minor change

* fix minor bug

* minor change

* minor change

* add unittests and fix docstrings
2021-01-25 18:10:14 +08:00
LXXXXR 13c1210741
[Feature] Add thrs in eval_metrics (#146)
* support thr

* replace thrs with thr

* fix docstring

* minor change

* revise according to comments

* revised according to comments

* revise according to comments

* rewrite basedataset.evaluate to avoid duplicate calculation

* minor change

* change thr to thrs

* add more unit test
2021-01-25 17:54:22 +08:00
LXXXXR 8e990b5654
[Feature] Support support and class-wise evaluation results (#143)
* support support, support class-wise evaluation results and move eval_metrics.py

* Fix docstring

* change average to be non-optional

* revise according to comments

* add more unittest
2021-01-19 16:42:16 +08:00
LXXXXR 6916f33d56
[Feature] Add asymmetric loss for multilabel task (#132)
* add asymmetric loss

* minor change

* fix docstring

* do not apply sum over classes and fix docstring

* fix docstring

* fix weight shape

* fix weight shape

* add reference

* fix linkting issue

Co-authored-by: Y. Xiong <xiongyuxy@gmail.com>
2021-01-11 11:22:22 +08:00
LXXXXR c07e60dd7d
[Feature] Support PASCAL VOC 2007 dataset for multilabel task (#134)
* support voc

* minor change
2021-01-11 11:08:59 +08:00
LXXXXR 194ab7efda
[Feature] Add bce loss for multilabel task (#130)
* add bce loss for multilabel task

* minor change

* apply class wise sum

* fix docstring

* do not apply sum over classes and fix docstring

* fix docstring

* fix weight shape

* fix weight shape

* fix docstring

* fix linting issue

Co-authored-by: Y. Xiong <xiongyuxy@gmail.com>
2021-01-11 11:05:24 +08:00
LXXXXR 9578bfa0f1
[Feature] Add focal loss for multilabel task (#131)
* add focal loss

* apply class wise sum

* fix doctring

* do not apply sum over classes and fix docstring

* fix docstring

* fix weight shape

* fix weight shape
2021-01-08 20:44:23 +08:00
LXXXXR 1df10beaa1
Add evaluation metrics for multilabel task (#123)
* add mean_ap

* add difficult_examples in mAP to support dataset without difficult_examples

* fix docstring

* add CP,CR,CF1,OP,OR,OF1 as multilabel metrics

* fix docstring

* temporary solution to ci until new version of mmcv is avaliable (#127)

* temporary solution to ci until new version of mmcv is avaliable

* temporary solution to ci until new version of mmcv is avaliable

* add mean_ap

* add difficult_examples in mAP to support dataset without difficult_examples

* fix docstring

* add CP,CR,CF1,OP,OR,OF1 as multilabel metrics

* fix docstring

* Swap -1 and 0 for labels

* Revised according to comments

* Revised according to comments

* Revised according to comments

* Revert "Revised according to comments"
It is suggested that we should not include paper from arxiv.
This reverts commit 48a781cd6a.

* Revert "Revert "Revised according to comments""

This reverts commit 6d3b0f1a7b.

* Revert "Revised according to comments"
It is suggested we should not cite paper from arxiv.
This reverts commit 120ecda884.

* Revised according to comments

* revised according to comments

* Revised according to comments
2021-01-04 12:25:33 +08:00
LXXXXR 4203b94643
fix bug in eval_metrics (#122) 2020-12-23 16:20:47 +08:00
LXXXXR b1e91f256b
fix bug in recall and precision (#112) 2020-12-09 16:27:42 +08:00
LXXXXR 21fd5019fb
add macro-averaged precision,recall,f1 options in evaluation (#93)
* add macro-averaged precision,recall,f1 options in evaluation

* remove unnecessary comments

* Revise according to comments

* Revise according to comments
2020-11-25 16:13:54 +08:00
LXXXXR 7636409b3b
add get_class in base_dataset (#85)
* modify base_dataset

* revise according to the comments
2020-11-12 14:22:02 +08:00
David de la Iglesia Castro df2189c6f6
Add missing CLASSES argument to dataset wrappers (#66)
* Add missing classes in dataset wrappers

* Update tests
2020-10-15 21:25:53 +08:00
David de la Iglesia Castro 4f4f2957ef
Use build_runner (#54)
* Use build_runner in train api

* Support iter in eval_hook

* Add runner section

* Add test_eval_hook

* Pin mmcv version in install docs

* Replace max_iters with max_epochs

* Set by_epoch=True as default

* Remove trailing space

* Replace DeprecationWarning with UserWarning

* pre-commit

* Fix tests
2020-10-15 21:12:50 +08:00
Lei Yang bc1b08ba41
Add VGG and pretained models (#27)
* add vgg

* add vgg model coversion tool

* fix out_indices and docstr

* add vgg models in configs

* add params, flops and accuracy in docs

* add pretrained models url

* use ConvModule and refine var names

* update vgg conversion tool

* modify bn config

* add docs for arch_setting

* add unit test for vgg

* rm debug code

* update vgg pretrained models
2020-09-29 17:49:42 +08:00