Commit Graph

260 Commits (9038c1c25516c20f144d4cfa267890d9562267f2)

Author SHA1 Message Date
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
Yinhao Li b67a11c548
Fix kwargss to kwargs. (#274) 2021-05-26 19:27:30 +08:00
Wenwei Zhang 5ee08767f2
inherits mmcv registry (#252) 2021-05-14 23:36:56 +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 16947f1239
[Bug]Fix weight decay (#227)
* 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 AutoAugment

* fix weight decay in vit

* change eval interval to 10

* add mytrain.py for test

* test before layers

* test attr in layers

* test classifier

* delete mytrain.py

* delete @torch.jit.ignore

* change eval interval back to 1

* add some comments to imagenet_bs2048_AdamW

* add some comments
2021-04-28 17:16:43 +08:00
whcao 31a6a362ba
Add some vit configs (#217)
* add vit_base_patch32_384_finetune.py

* add vit_base_patch32_384_finetune_imagenet.py to vision_transformer

* add vit_large_patch16_384_finetune.py to models

* add vit_large_patch16_384_finetune_imagenet.py to vision_transformer

* add vit_large_patch32_384_finetune to models

* add vit_large_patch32_384_finetune_imagenet to vision_transformer

* add vit_large_patch16_224_finetune.py to models

* add vit_large_patch16_224_finetune_imagenet.py to vision_transformer

* delete some useless comments
2021-04-20 11:32:20 +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
LXXXXR 7d618e6606
[Fix] Fix version (#209)
* fix version

* add projects in openmmlab

* minor fix

* empty

* add mmocr

* empty

* empty

* fix linting
2021-04-16 19:07:17 +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 e76c5a368d
[Feature] Support fp16 training (#178)
* change mmcls fp16 to mmcv hook

* support fp16

* clean unnessary stuff
2021-03-17 15:53:55 +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 a225cb6bdb
fix img_metas bug (#152) 2021-01-26 11:24:08 +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 b98b317012
fix bug in vgg weight_init (#140) 2021-01-15 10:23:11 +08:00
LXXXXR 63f38988eb
[Fix] Fix optional issues in docstring (#138)
* fix optional issue in docstring

* revised according to comments

* add optional
2021-01-14 11:09:08 +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 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 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
Ülkü Tuncer Küçüktaş 6f7698cb7c
Update accuracy.py (#104)
Co-authored-by: Ülkü Tuncer Küçüktaş <UlkuTuncerKucuktas@users.noreply.github.com>
2020-12-01 14:25:18 +08:00
WRH 44bbc71e14
Fix bug and optimize MNIST config (#98)
* add simple_test to ClsHead

* optimize lenet training config

* recover path setting
2020-11-26 15:27:04 +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
Lei Yang 24fd4fb627
Visualize results on image demo (#58)
* visualize results on image demo

* add matplotlib in requirements
2020-10-10 16:33:27 +08:00
Lei Yang 9547e7b7a5
Add model inference (#16)
* add model inference on single image

* rm --eval

* revise doc

* add inference tool and demo

* fix linting

* rename inference_image to inference_model

* infer pred_label and pred_score

* fix linting

* add docstr for inference

* add remove_keys

* add doc for inference

* dump results rather than outputs

* add class_names

* add related infer scripts

* add demo image and the first part of colab tutorial

* conduct evaluation in dataset

* return lst in simple_test

* compuate topk accuracy with numpy

* return outputs in test api

* merge inference and evaluation tool

* fix typo

* rm gt_labels in test conifg

* get gt_labels during evaluation

* sperate the ipython notebook to another PR

* return tensor for onnx_export

* detach var in simple_test

* rm inference script

* rm inference script

* construct data dict to replace LoadImage

* print first predicted result if args.out is None

* modify test_pipeline in inference

* refactor class_names of imagenet

* set class_to_idx as a property in base dataset

* output pred_class during inference

* remove unused docstr
2020-09-30 19:00:20 +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
Jerry Jiarui XU 8d3acce307
Add ResNeSt (#25)
* Add ResNeSt

* fixed test

* refactor

* add ResNeSt base

* update modelzoo

* update modelzoo

* Add S-200,S269 _base_
2020-09-22 10:41:51 +08:00
Xiaojie Li 7af9419ffa
Fix init_weights in 'shufflenet_v2.py'. (#29)
* fix init_weights in shufflenetv2

* fix doc

* fix doc

Co-authored-by: lixiaojie <lixiaojie@sensetime.com>
2020-08-13 09:49:41 +08:00
Lei Yang 408d92bcbe
revise docstr of alexnet to correct input_size (#26) 2020-08-12 16:14:19 +08:00
yanglei 9a661ef981 Add ResNet_CIFAR 2020-07-12 00:06:56 +08:00
lixiaojie c1d0090700 Change the init_weight for shufflenet models 2020-07-12 00:06:56 +08:00
yanglei 45812e87bd add weighted_loss 2020-07-12 00:06:55 +08:00
lixiaojie 1d5f3d8c24 update shufflenet_v1 2020-07-12 00:06:55 +08:00
lixiaojie f6260b33bf Add RandomCrop, RandomResizedCrop, RandomGrayscale, impad 2020-07-12 00:06:55 +08:00
yanglei 8995e16834 Add AlexNet and LeNet5 2020-07-12 00:06:54 +08:00
yanglei fbc68bf266 Add classifiers, heads, necks and losses 2020-07-07 19:32:06 +08:00
yanglei 17092d8be4 Fix the mid_channels of SEResNeXt 2020-07-07 11:25:48 +08:00
lixiaojie eb24a94b68 add mobilenetv2 convert code 2020-07-05 21:59:22 +08:00
lixiaojie 046aa5c003 add shufflenet_v2 convert code 2020-07-03 19:21:18 +08:00
chenkai 91a43c5bac Add RegNet 2020-07-01 14:21:45 +08:00
louzan 03b75789c6 Dev mobilenetv3 2020-06-30 15:50:36 +08:00
chenkai 02e11cc1f3 Refactoring for ResNet family 2020-06-25 11:57:50 +08:00
lixiaojie 50208498dd Update mobilenetv2 2020-06-22 19:40:31 +08:00
yangmingmin 29e17ab326 Dev se resnext 2020-06-19 11:45:42 +08:00
yangmingmin f729a60f87 Dev se resnet 2020-06-17 14:20:20 +08:00
chenkai c168aa786e Merge branch 'fix/resnet_zero_init_residual' into 'master'
Set default zero_init_residual of ResNet to True

See merge request open-mmlab/mmclassification!22
2020-06-16 22:09:48 +08:00
louzan deee5d61d7 add mobilenetv2 2020-06-16 14:37:03 +08:00
yanglei 800ace3137 set default zero_init_residual to True 2020-06-16 11:36:54 +08:00
lixiaojie fcb1ad80e4 merge master 2020-06-16 00:49:55 +08:00
lixiaojie 66e9bb017d fix unit test 2020-06-16 00:03:45 +08:00
lixiaojie 8060e0f620 merge master 2020-06-15 20:54:52 +08:00
lixiaojie 1ce116a898 Merge branch 'master' of gitlab.sz.sensetime.com:open-mmlab/mmclassification into dev_shufflenetv1 2020-06-15 20:52:27 +08:00
lixiaojie edceab13e3 modify self.layers 2020-06-15 20:52:17 +08:00
qianchen 5662daeea8 Merge branch 'dev_shufflenetv1' into 'master'
add shufflenetv1

See merge request open-mmlab/mmclassification!10
2020-06-15 20:49:44 +08:00
lixiaojie 8249ad7205 merge master 2020-06-15 20:46:30 +08:00
lixiaojie cf85db0f7c Merge branch 'master' of gitlab.sz.sensetime.com:open-mmlab/mmclassification into dev_shufflenetv2 2020-06-15 20:42:22 +08:00
lixiaojie 703714b78e modify format of self.layers 2020-06-15 20:42:04 +08:00
wangshiguang a1da2013ad add pat ci image 2020-06-15 17:43:40 +08:00
lixiaojie 29975930f9 Dev/backbone utils 2020-06-15 16:42:15 +08:00
lixiaojie 3bf971238a fix grammar 2020-06-15 16:29:36 +08:00
lixiaojie 402bedf489 update assertion message 2020-06-15 16:26:24 +08:00
lixiaojie c3576c77fe fix docstring 2020-06-15 16:21:58 +08:00
lixiaojie b0a0248404 fix grammar & indent problem 2020-06-15 16:16:27 +08:00
lixiaojie 3bf34be1ed fix indent problem 2020-06-15 16:11:51 +08:00
lixiaojie 62f65153f9 update shufflenet_v2.py 2020-06-15 15:15:19 +08:00
lixiaojie 24ef3b2f61 fix linting 2020-06-15 02:34:22 +08:00
lixiaojie 58faa2381c fix norm_eval & merge master 2020-06-15 02:22:50 +08:00
lixiaojie 326df68bb3 fix norm_eval & merge master 2020-06-15 02:16:13 +08:00
yanglei a5b53ada94 use standard docstr for basic and bottleneck block 2020-06-14 13:29:47 +08:00
chenkai 335047083e Merge branch 'align_resnet_accuracy' into 'master'
Align resnet accuracy

See merge request open-mmlab/mmclassification!16
2020-06-14 12:11:07 +08:00
yanglei 76f91510b3 Add ResNeXt 2020-06-14 12:08:37 +08:00
yanglei 7ec1429e1b set default value of norm_eval and zero_init_residual to False 2020-06-14 11:56:18 +08:00
lixiaojie 461e07d65d Update default value 2020-06-14 03:51:42 +08:00
lixiaojie fb3934fd2c fix norm_cfg&rewrite 2020-06-14 01:23:40 +08:00
lixiaojie 02e1c246b4 Update shufflenet_v2.py 2020-06-14 01:13:10 +08:00
lixiaojie e3e980d84e rewrite 2020-06-14 00:46:22 +08:00
lixiaojie 940c955523 fix description 2020-06-12 20:27:07 +08:00
lixiaojie 77c05e6b46 fix indent 2020-06-12 18:13:42 +08:00
lixiaojie 996f0a97e1 fix format 2020-06-12 18:07:53 +08:00
lixiaojie eebb7561bf merge mastewr 2020-06-12 16:49:28 +08:00
lixiaojie 75858a3d3e merge master 2020-06-12 16:16:28 +08:00
yanglei 3a65f4529e Add Base and ResNet backbone 2020-06-12 14:40:27 +08:00
lixiaojie 93612db881 fix linting 2020-06-11 16:01:54 +08:00
lixiaojie 72bbfbc489 use ConvModule/build_*_layer from mmcv & use *_cfg & add _freeze_stages 2020-06-11 15:55:17 +08:00
lixiaojie 38a1c2533a use ConvModule 2020-06-10 16:53:43 +08:00
lixiaojie 05e5173b6b complete the docstring & import from mmcv & range check for frozen_stages and out_indices 2020-06-10 15:43:38 +08:00
lixiaojie 16b4efbe06 add unit test 2020-06-07 23:33:47 +08:00
lixiaojie e1f39f003e Merge branch 'dev_shufflenetv1' into dev_shufflenetv2 2020-06-07 22:44:06 +08:00
lixiaojie b01a00c0c8 rm mbn-v2 2020-06-07 22:43:20 +08:00
lixiaojie 98f5b49ffe add unit test 2020-06-07 22:40:36 +08:00
lixiaojie 2ee95c44ce Merge branch 'dev_mobilenetv2' into dev_shufflenetv1 2020-06-07 21:10:42 +08:00
lixiaojie fa49911440 reformat 2020-06-04 02:42:53 +08:00
lixiaojie b392ba44cc fix 2020-06-04 02:25:53 +08:00
lixiaojie 0667136f05 update test 2020-06-04 02:22:53 +08:00
lixiaojie 2c6c2d9063 Merge branch 'dev_mobilenetv2' into dev_shufflenetv1 2020-06-03 16:01:56 +08:00
lixiaojie e6987f1c3b fix import sort 2020-06-03 15:58:45 +08:00
lixiaojie 9712d18f9c sort 2020-06-03 15:57:07 +08:00
lixiaojie 83cc9fc279 fix flake8 2020-06-03 15:54:37 +08:00
lixiaojie 2aaff0e4f2 fix & add test 2020-06-03 15:51:17 +08:00
louzan 364a671ac9 add shufflenet_v2 2020-05-28 11:48:14 +08:00
louzan a542651794 add shufflenet_v1 2020-05-28 11:44:43 +08:00
louzan ba391c029a add mobilenetv2 2020-05-28 11:24:04 +08:00
chenkai b1e9b2ac9e remove redundant files 2020-05-21 21:31:48 +08:00
chenkai a99e6eb10d init commit 2020-05-21 21:21:43 +08:00