[Enhance] Better result visualization #419

mzr1996 · 2021-08-19T07:27:41Z

Motivation

Now, our show_result_pyplot doesn't support wait_time. And it uses OpenCV as the imshow backend, which may cause some problems, refers to open-mmlab/mmdetection#4389

Modification

Modify the visualization APIs and code structure as mmdet style.

BC-breaking (Optional)

No

Use cases (Optional)

Use demo as example:

python demo/image_demo.py demo/demo.JPEG config/resnet/resnet50_b32x8_imagenet.py resnet50.pth

Previous version demo

Current version demo

Checklist

Before PR:

Pre-commit or other linting tools are used to fix the potential lint issues.
Bug fixes are fully covered by unit tests, the case that causes the bug should be added in the unit tests.
The modification is covered by complete unit tests. If not, please add more unit test to ensure the correctness.
The documentation has been modified accordingly, like docstring or example tutorials.

After PR:

If the modification has potential influence on downstream or other related projects, this PR should be tested with those projects, like MMDet or MMSeg.
CLA has been signed and all committers have signed the CLA in this PR.

to matplotlib.

codecov · 2021-08-19T07:48:51Z

Codecov Report

Merging #419 (d130f40) into master (5c4da16) will increase coverage by 0.30%.
The diff coverage is 92.39%.

❗ Current head d130f40 differs from pull request most recent head f0a129d. Consider uploading reports for the commit f0a129d to get more accurate results

@@            Coverage Diff             @@
##           master     #419      +/-   ##
==========================================
+ Coverage   76.68%   76.98%   +0.30%     
==========================================
  Files          97       99       +2     
  Lines        5216     5271      +55     
  Branches      853      863      +10     
==========================================
+ Hits         4000     4058      +58     
+ Misses       1096     1093       -3     
  Partials      120      120

Flag	Coverage Δ
unittests	`76.98% <92.39%> (+0.30%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
mmcls/__init__.py	`89.65% <ø> (ø)`
mmcls/apis/__init__.py	`100.00% <ø> (ø)`
mmcls/apis/test.py	`24.13% <ø> (ø)`
mmcls/apis/train.py	`22.72% <ø> (ø)`
mmcls/core/__init__.py	`100.00% <ø> (ø)`
mmcls/core/evaluation/__init__.py	`100.00% <ø> (ø)`
mmcls/core/evaluation/eval_hooks.py	`22.41% <ø> (ø)`
mmcls/core/evaluation/eval_metrics.py	`80.76% <ø> (ø)`
mmcls/core/evaluation/mean_ap.py	`100.00% <ø> (ø)`
mmcls/core/evaluation/multilabel_eval_metrics.py	`100.00% <ø> (ø)`
... and 91 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5c4da16...f0a129d. Read the comment docs.

mmcls/apis/inference.py

mmcls/core/visualization/image.py

Ezra-Yu · 2021-08-24T09:06:42Z

mmcls/core/visualization/image.py

+            plt.show(block=False)
+            plt.pause(wait_time)
+    if out_file is not None:
+        mmcv.imwrite(img, out_file)


mmcv.imwrite(image, out_file, auto_mkdir=True) can suto make a dir if users forget to makedir.

The default value of auto_mkdir should be True?

Ezra-Yu · 2021-08-24T09:11:52Z

mmcls/models/classifiers/base.py

@@ -168,10 +168,11 @@ def val_step(self, data, optimizer):
    def show_result(self,
                    img,


api expresses that img can be a (str or ndarray), but here img can only be the image path.

mmcv.imread supports np.ndarray.

Ezra-Yu · 2021-08-24T09:19:58Z

mmcls/models/classifiers/base.py

@@ -197,27 +198,17 @@ def show_result(self,
        img = mmcv.imread(img)
        img = img.copy()


I think this line is redundant

This line prevents this function from modifying the original image.

Ezra-Yu · 2021-08-25T12:38:57Z

mmcls/core/visualization/image.py

+    return tuple(color)
+
+
+def imshow_cls_result(img,


Can this function be split into two, add_text and mmcls_show.
then in mmcls_show, it may be better to make the backend of img_show, img_show (backend="plt") and img_show (backend="opencv").

I think it's not convenient to split. We need to add text after plt.imshow, show argument only determine whether to call plt.show().
And if we have used plt.imshow, backend="cv2" is redundant.

mmcls/core/visualization/image.py

mmcls/core/visualization/__init__.py

Ezra-Yu

LGTM

* Imporve result visualization to support wait time and change the backend to matplotlib. * Add unit test for visualization * Add adaptive dpi function * Rename `imshow_cls_result` to `imshow_infos`. * Support str in `imshow_infos` * Improve docstring.

* Add RepVGG code. * Add se_module as plugin. * Add the repvggA0 primitive config * Change repvggA0.py to fit mmcls * Add RepVGG configs * Add repvgg_to_mmcls * Add tools/deployment/convert_repvggblock_param_to_deploy.py * Change configs/repvgg/README.md * Streamlining the number of configuration files. * Fix lints * Delete plugins * Delete code about plugin. * Modify the code for using se module. * Modify config to fit repvgg with se. * Change se_cfg to allow loading of pre-training parameters. * Reduce the complexity of the configuration file. * Finsh unitest for repvgg. * Fix bug about se in repvgg_to_mmcls. * Rename convert_repvggblock_param_to_deploy.py to reparameterize_repvgg.py, and delete setting about device. * test commit * test commit * test commit command * Modify repvgg.py to make the code more readable. * Add value=0 in F.pad() * Add se_cfg to arch_settings. * Fix bug. * modeify some attr name and Update unit tests * rename stage_0 to stem and branch_identity to branch_norm * update unit tests * add m.eval in unit tests * [Enhance] Enhence SE layer to support custom squeeze channels. (#417) * add enhenced SE * Update * rm basechannel * fix docstring * Update se_layer.py fix docstring * [Docs] Add algorithm readme and update meta yml (#418) * Add README.md for models without checkpoints. * Update model-index.yml * Update metafile.yml of seresnet * [Enhance] Add `hparams` argument in `AutoAugment` and `RandAugment` and some other improvement. (#398) * Add hparams argument in `AutoAugment` and `RandAugment`. And `pad_val` supports sequence instead of tuple only. * Add unit tests for `AutoAugment` and `hparams` in `RandAugment`. * Use smaller test image to speed up uni tests. * Use hparams to simplify RandAugment config in swin-transformer. * Rename augment config name from `pipeline` to `pipelines`. * Add some commnet ad docstring. * [Feature] Support classwise weight in losses (#388) * Add classwise weight in losses:CE,BCE,softBCE * Update unit test * rm some extra code * rm some extra code * fix broadcast * fix broadcast * update unit tests * use new_tensor * fix lint * [Enhance] Better result visualization (#419) * Imporve result visualization to support wait time and change the backend to matplotlib. * Add unit test for visualization * Add adaptive dpi function * Rename `imshow_cls_result` to `imshow_infos`. * Support str in `imshow_infos` * Improve docstring. * Bump version to v0.15.0 (#426) * [CI] Add PyTorch 1.9 and Python 3.9 build workflow, and remove some CI. (#422) * Add PyTorch 1.9 build workflow, and remove some CI. * Add Python 3.9 CI * Show Python 3.9 support. * [Enhance] Rename the option `--options` in some tools to `--cfg-options`. (#425) * [Docs] Fix sphinx version (#429) * [Docs] Add `CITATION.cff` (#428) * Add CITATION.cff * Fix typo in setup.py * Change author in setup.py * modeify some attr name and Update unit tests * rename stage_0 to stem and branch_identity to branch_norm * update unit tests * add m.eval in unit tests * Update unit tests * refactor * refactor * Alignment inference accuracy * Update configs, readme and metafile * Update readme * return tuple and fix metafile * fix unit test * rm regnet and classifiers changes * update auto_aug * update metafile & readme * use delattr * rename cfgs * Update checkpoint url * Update readme * Rename config files. * Update readme and metafile * add comment * Update mmcls/models/backbones/repvgg.py Co-authored-by: Ma Zerun <mzr1996@163.com> * Update docstring * Improve docstring. * Update unittest_testblock Co-authored-by: Ezra-Yu <1105212286@qq.com> Co-authored-by: Ma Zerun <mzr1996@163.com>

* Imporve result visualization to support wait time and change the backend to matplotlib. * Add unit test for visualization * Add adaptive dpi function * Rename `imshow_cls_result` to `imshow_infos`. * Support str in `imshow_infos` * Improve docstring.

* Add RepVGG code. * Add se_module as plugin. * Add the repvggA0 primitive config * Change repvggA0.py to fit mmcls * Add RepVGG configs * Add repvgg_to_mmcls * Add tools/deployment/convert_repvggblock_param_to_deploy.py * Change configs/repvgg/README.md * Streamlining the number of configuration files. * Fix lints * Delete plugins * Delete code about plugin. * Modify the code for using se module. * Modify config to fit repvgg with se. * Change se_cfg to allow loading of pre-training parameters. * Reduce the complexity of the configuration file. * Finsh unitest for repvgg. * Fix bug about se in repvgg_to_mmcls. * Rename convert_repvggblock_param_to_deploy.py to reparameterize_repvgg.py, and delete setting about device. * test commit * test commit * test commit command * Modify repvgg.py to make the code more readable. * Add value=0 in F.pad() * Add se_cfg to arch_settings. * Fix bug. * modeify some attr name and Update unit tests * rename stage_0 to stem and branch_identity to branch_norm * update unit tests * add m.eval in unit tests * [Enhance] Enhence SE layer to support custom squeeze channels. (open-mmlab#417) * add enhenced SE * Update * rm basechannel * fix docstring * Update se_layer.py fix docstring * [Docs] Add algorithm readme and update meta yml (open-mmlab#418) * Add README.md for models without checkpoints. * Update model-index.yml * Update metafile.yml of seresnet * [Enhance] Add `hparams` argument in `AutoAugment` and `RandAugment` and some other improvement. (open-mmlab#398) * Add hparams argument in `AutoAugment` and `RandAugment`. And `pad_val` supports sequence instead of tuple only. * Add unit tests for `AutoAugment` and `hparams` in `RandAugment`. * Use smaller test image to speed up uni tests. * Use hparams to simplify RandAugment config in swin-transformer. * Rename augment config name from `pipeline` to `pipelines`. * Add some commnet ad docstring. * [Feature] Support classwise weight in losses (open-mmlab#388) * Add classwise weight in losses:CE,BCE,softBCE * Update unit test * rm some extra code * rm some extra code * fix broadcast * fix broadcast * update unit tests * use new_tensor * fix lint * [Enhance] Better result visualization (open-mmlab#419) * Imporve result visualization to support wait time and change the backend to matplotlib. * Add unit test for visualization * Add adaptive dpi function * Rename `imshow_cls_result` to `imshow_infos`. * Support str in `imshow_infos` * Improve docstring. * Bump version to v0.15.0 (open-mmlab#426) * [CI] Add PyTorch 1.9 and Python 3.9 build workflow, and remove some CI. (open-mmlab#422) * Add PyTorch 1.9 build workflow, and remove some CI. * Add Python 3.9 CI * Show Python 3.9 support. * [Enhance] Rename the option `--options` in some tools to `--cfg-options`. (open-mmlab#425) * [Docs] Fix sphinx version (open-mmlab#429) * [Docs] Add `CITATION.cff` (open-mmlab#428) * Add CITATION.cff * Fix typo in setup.py * Change author in setup.py * modeify some attr name and Update unit tests * rename stage_0 to stem and branch_identity to branch_norm * update unit tests * add m.eval in unit tests * Update unit tests * refactor * refactor * Alignment inference accuracy * Update configs, readme and metafile * Update readme * return tuple and fix metafile * fix unit test * rm regnet and classifiers changes * update auto_aug * update metafile & readme * use delattr * rename cfgs * Update checkpoint url * Update readme * Rename config files. * Update readme and metafile * add comment * Update mmcls/models/backbones/repvgg.py Co-authored-by: Ma Zerun <mzr1996@163.com> * Update docstring * Improve docstring. * Update unittest_testblock Co-authored-by: Ezra-Yu <1105212286@qq.com> Co-authored-by: Ma Zerun <mzr1996@163.com>

mzr1996 added 3 commits August 19, 2021 12:02

Imporve result visualization to support wait time and change the backend

a08260a

to matplotlib.

Add unit test for visualization

80318ae

Add adaptive dpi function

4d321eb

mzr1996 requested a review from Ezra-Yu August 19, 2021 07:27

Ezra-Yu reviewed Aug 25, 2021

View reviewed changes

mmcls/core/visualization/image.py Outdated Show resolved Hide resolved

Ezra-Yu reviewed Aug 25, 2021

View reviewed changes

mmcls/core/visualization/__init__.py Outdated Show resolved Hide resolved

mzr1996 added 3 commits August 26, 2021 14:09

Rename imshow_cls_result to imshow_infos.

5856a5d

Support str in imshow_infos

c22e27b

Improve docstring.

f0a129d

mzr1996 requested a review from Ezra-Yu August 26, 2021 06:28

Ezra-Yu approved these changes Aug 31, 2021

View reviewed changes

mzr1996 merged commit 5383787 into open-mmlab:master Aug 31, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Enhance] Better result visualization #419

[Enhance] Better result visualization #419

mzr1996 commented Aug 19, 2021

codecov bot commented Aug 19, 2021 •

edited

Loading

Ezra-Yu Aug 24, 2021

mzr1996 Aug 26, 2021

Ezra-Yu Aug 24, 2021

mzr1996 Aug 26, 2021

Ezra-Yu Aug 24, 2021

mzr1996 Aug 26, 2021

Ezra-Yu Aug 25, 2021 •

edited

Loading

mzr1996 Aug 26, 2021

Ezra-Yu left a comment

		@@ -168,10 +168,11 @@ def val_step(self, data, optimizer):
		def show_result(self,
		img,

		@@ -197,27 +198,17 @@ def show_result(self,
		img = mmcv.imread(img)
		img = img.copy()

[Enhance] Better result visualization #419

[Enhance] Better result visualization #419

Conversation

mzr1996 commented Aug 19, 2021

Motivation

Modification

BC-breaking (Optional)

Use cases (Optional)

Previous version demo

Current version demo

Checklist

codecov bot commented Aug 19, 2021 • edited Loading

Codecov Report

Ezra-Yu Aug 24, 2021

Choose a reason for hiding this comment

mzr1996 Aug 26, 2021

Choose a reason for hiding this comment

Ezra-Yu Aug 24, 2021

Choose a reason for hiding this comment

mzr1996 Aug 26, 2021

Choose a reason for hiding this comment

Ezra-Yu Aug 24, 2021

Choose a reason for hiding this comment

mzr1996 Aug 26, 2021

Choose a reason for hiding this comment

Ezra-Yu Aug 25, 2021 • edited Loading

Choose a reason for hiding this comment

mzr1996 Aug 26, 2021

Choose a reason for hiding this comment

Ezra-Yu left a comment

Choose a reason for hiding this comment

codecov bot commented Aug 19, 2021 •

edited

Loading

Ezra-Yu Aug 25, 2021 •

edited

Loading