From e5f071afb80d899c6c44eb95ac8e0357b492b369 Mon Sep 17 00:00:00 2001 From: Tong Gao Date: Thu, 4 Aug 2022 14:01:27 +0800 Subject: [PATCH] Bump version to 0.6.1 (#1249) * Bump version to 0.6.1 * update version limit * update * update date * update --- README.md | 9 ++--- README_zh-CN.md | 9 ++--- docs/en/changelog.md | 78 ++++++++++++++++++++++++++++++++++++++ docs/en/install.md | 1 + docs/zh_cn/install.md | 1 + mmocr/__init__.py | 4 +- mmocr/version.py | 2 +- requirements/mminstall.txt | 4 +- 8 files changed, 93 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2f38169c..e7378508 100644 --- a/README.md +++ b/README.md @@ -70,12 +70,11 @@ The main branch works with **PyTorch 1.6+**. ## What's New -v0.6.0 was released in 2022-05-05. +v0.6.1 was released in 2022-08-04. -1. We support [MASTER](https://arxiv.org/abs/1910.02562) and [DBNet++](https://arxiv.org/abs/2202.10304) now! -2. Three dataset converters are added: LSVT, RCTW, and HierText. -3. MMOCR now can load data from LMDB dataset. [Doc](https://mmocr.readthedocs.io/en/latest/tools.html#convert-text-recognition-dataset-to-lmdb-format) -4. We provide a script to convert .json labels obtained by **Labelme** into MMOCR-supported data format. +1. ArT dataset is available for text detection and recognition! +2. Fix several bugs that affects the correctness of the models. +3. Thanks to [MIM](https://github.com/open-mmlab/mim), our installation is much simpler now! The [docs](https://mmocr.readthedocs.io/en/latest/install.html) has been renewed as well. Read [Changelog](https://mmocr.readthedocs.io/en/latest/changelog.html) for more details! diff --git a/README_zh-CN.md b/README_zh-CN.md index 4225bae3..d6346909 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -71,12 +71,11 @@ MMOCR 的模块化设计使用户可以定义自己的优化器，数据预处 ## 最新进展 -最新的月度版本 v0.6.0 在 2022.05.05 发布。 +最新的月度版本 v0.6.1 在 2022.08.04 发布。 -1. 支持了两个新模型：[MASTER](https://arxiv.org/abs/1910.02562) 和 [DBNet++](https://arxiv.org/abs/2202.10304) -2. 新支持了三个数据集：LSVT, RCTW 和 HierText -3. 支持从 LMDB 数据集读取数据 [查看文档](https://mmocr.readthedocs.io/en/latest/tools.html#convert-text-recognition-dataset-to-lmdb-format) -4. 提供了 Labelme 数据格式转换脚本，可使 MMOCR 支持由 Labelme 标注的数据 +1. 对文本检测和识别任务，新支持了 ArT 数据集。 +2. 修复了多个可能影响模型正确性的错误。 +3. 使用 MIM 对安装步骤进行了简化，我们的[安装文档](https://mmocr.readthedocs.io/zh_CN/latest/install.html)亦有了同步更新。 阅读[更新日志](https://mmocr.readthedocs.io/en/latest/changelog.html)以获取更多信息。 diff --git a/docs/en/changelog.md b/docs/en/changelog.md index 788dc3c6..6c94a29e 100644 --- a/docs/en/changelog.md +++ b/docs/en/changelog.md @@ -1,5 +1,83 @@ # Changelog +## 0.6.1 (04/08/2022) + +### Highlights + +1. ArT dataset is available for text detection and recognition! +2. Fix several bugs that affects the correctness of the models. +3. Thanks to [MIM](https://github.com/open-mmlab/mim), our installation is much simpler now! The [docs](https://mmocr.readthedocs.io/en/latest/install.html) has been renewed as well. + +### New Features & Enhancements + +- Add ArT by @xinke-wang in https://github.com/open-mmlab/mmocr/pull/1006 +- add ABINet_Vision api by @Abdelrahman350 in https://github.com/open-mmlab/mmocr/pull/1041 +- add codespell ignore and use mdformat by @Harold-lkk in https://github.com/open-mmlab/mmocr/pull/1022 +- Add mim to extras_requrie to setup.py, update mminstall… by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1062 +- Simplify normalized edit distance calculation by @maxbachmann in https://github.com/open-mmlab/mmocr/pull/1060 +- Test mim in CI by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1090 +- Remove redundant steps by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1091 + +* Update links to SDMGR links by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1252 + +### Bug Fixes + +- Remove unnecessary requirements by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1000 +- Remove confusing img_scales in pipelines by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1007 +- inplace operator "+=" will cause RuntimeError when model backward by @garvan2021 in https://github.com/open-mmlab/mmocr/pull/1018 +- Fix a typo problem in MASTER by @Mountchicken in https://github.com/open-mmlab/mmocr/pull/1031 +- Fix config name of MASTER in ocr.py by @Mountchicken in https://github.com/open-mmlab/mmocr/pull/1044 +- Relax OpenCV requirement by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1061 +- Restrict the minimum version of OpenCV to avoid potential vulnerability by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1065 +- typo by @tpoisonooo in https://github.com/open-mmlab/mmocr/pull/1024 +- Fix a typo in setup.py by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1095 +- fix #1067: add torchserve DockerFile and fix bugs by @Hegelim in https://github.com/open-mmlab/mmocr/pull/1073 +- Incorrect filename in labelme_converter.py by @xiefeifeihu in https://github.com/open-mmlab/mmocr/pull/1103 +- Fix dataset configs by @Mountchicken in https://github.com/open-mmlab/mmocr/pull/1106 +- Fix #1098: normalize text recognition scores by @Hegelim in https://github.com/open-mmlab/mmocr/pull/1119 +- Update ST_SA_MJ_train.py by @MingyuLau in https://github.com/open-mmlab/mmocr/pull/1117 +- PSENet metafile by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1121 +- Flexible ways of getting file name by @balandongiv in https://github.com/open-mmlab/mmocr/pull/1107 +- Updating edge-embeddings after each GNN layer by @amitbcp in https://github.com/open-mmlab/mmocr/pull/1134 +- links update by @TekayaNidham in https://github.com/open-mmlab/mmocr/pull/1141 +- bug fix: access params by cfg.get by @doem97 in https://github.com/open-mmlab/mmocr/pull/1145 +- Fix a bug in LmdbAnnFileBackend that cause breaking in Synthtext detection training by @Mountchicken in https://github.com/open-mmlab/mmocr/pull/1159 +- Fix typo of --lmdb-map-size default value by @easilylazy in https://github.com/open-mmlab/mmocr/pull/1147 +- Fixed docstring syntax error of line 19 & 21 by @APX103 in https://github.com/open-mmlab/mmocr/pull/1157 +- Update lmdb_converter and ct80 cropped image source in document by @doem97 in https://github.com/open-mmlab/mmocr/pull/1164 +- MMCV compatibility due to outdated MMDet by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1192 +- Update maximum version of mmcv by @xinke-wang in https://github.com/open-mmlab/mmocr/pull/1219 +- Update ABINet links for main by @Mountchicken in https://github.com/open-mmlab/mmocr/pull/1221 +- Update owners by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1248 +- Add back some missing fields in configs by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1171 + +### Docs + +- Fix typos by @xinke-wang in https://github.com/open-mmlab/mmocr/pull/1001 +- Configure Myst-parser to parse anchor tag by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1012 +- Fix a error in docs/en/tutorials/dataset_types.md by @Mountchicken in https://github.com/open-mmlab/mmocr/pull/1034 +- Update readme according to the guideline by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1047 +- Limit markdown version by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1172 +- Limit extension versions by @Mountchicken in https://github.com/open-mmlab/mmocr/pull/1210 + +* Update installation guide by @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1254 +* Update image link @gaotongxiao in https://github.com/open-mmlab/mmocr/pull/1255 + +### New Contributors + +- @tpoisonooo made their first contribution in https://github.com/open-mmlab/mmocr/pull/1024 +- @Abdelrahman350 made their first contribution in https://github.com/open-mmlab/mmocr/pull/1041 +- @Hegelim made their first contribution in https://github.com/open-mmlab/mmocr/pull/1073 +- @xiefeifeihu made their first contribution in https://github.com/open-mmlab/mmocr/pull/1103 +- @MingyuLau made their first contribution in https://github.com/open-mmlab/mmocr/pull/1117 +- @balandongiv made their first contribution in https://github.com/open-mmlab/mmocr/pull/1107 +- @amitbcp made their first contribution in https://github.com/open-mmlab/mmocr/pull/1134 +- @TekayaNidham made their first contribution in https://github.com/open-mmlab/mmocr/pull/1141 +- @easilylazy made their first contribution in https://github.com/open-mmlab/mmocr/pull/1147 +- @APX103 made their first contribution in https://github.com/open-mmlab/mmocr/pull/1157 + +**Full Changelog**: https://github.com/open-mmlab/mmocr/compare/v0.6.0...v0.6.1 + ## 0.6.0 (05/05/2022) ### Highlights diff --git a/docs/en/install.md b/docs/en/install.md index d950cf1b..152bb26c 100644 --- a/docs/en/install.md +++ b/docs/en/install.md @@ -215,6 +215,7 @@ MMOCR has different version requirements on MMCV and MMDetection at each release | MMOCR | MMCV | MMDetection | | ------------ | ------------------------ | --------------------------- | | main | 1.3.8 \<= mmcv \<= 1.7.0 | 2.21.0 \<= mmdet \<= 3.0.0 | +| 0.6.1 | 1.3.8 \<= mmcv \<= 1.7.0 | 2.21.0 \<= mmdet \<= 3.0.0 | | 0.6.0 | 1.3.8 \<= mmcv \<= 1.6.0 | 2.21.0 \<= mmdet \<= 3.0.0 | | 0.5.0 | 1.3.8 \<= mmcv \<= 1.5.0 | 2.14.0 \<= mmdet \<= 3.0.0 | | 0.4.0, 0.4.1 | 1.3.8 \<= mmcv \<= 1.5.0 | 2.14.0 \<= mmdet \<= 2.20.0 | diff --git a/docs/zh_cn/install.md b/docs/zh_cn/install.md index 008b2d37..50ff23af 100644 --- a/docs/zh_cn/install.md +++ b/docs/zh_cn/install.md @@ -216,6 +216,7 @@ docker run --gpus all --shm-size=8g -it -v {实际数据目录}:/mmocr/data mmoc | MMOCR | MMCV | MMDetection | | ------------ | ------------------------ | --------------------------- | | main | 1.3.8 \<= mmcv \<= 1.7.0 | 2.21.0 \<= mmdet \<= 3.0.0 | +| v0.6.1 | 1.3.8 \<= mmcv \<= 1.7.0 | 2.21.0 \<= mmdet \<= 3.0.0 | | 0.6.0 | 1.3.8 \<= mmcv \<= 1.6.0 | 2.21.0 \<= mmdet \<= 3.0.0 | | 0.5.0 | 1.3.8 \<= mmcv \<= 1.5.0 | 2.14.0 \<= mmdet \<= 3.0.0 | | 0.4.0, 0.4.1 | 1.3.8 \<= mmcv \<= 1.5.0 | 2.14.0 \<= mmdet \<= 2.20.0 | diff --git a/mmocr/__init__.py b/mmocr/__init__.py index 08c85407..ebd0e564 100644 --- a/mmocr/__init__.py +++ b/mmocr/__init__.py @@ -51,7 +51,7 @@ mmcv_maximum_version = '1.7.0' mmcv_version = digit_version(mmcv.__version__) assert (mmcv_version >= digit_version(mmcv_minimum_version) - and mmcv_version <= digit_version(mmcv_maximum_version)), \ + and mmcv_version < digit_version(mmcv_maximum_version)), \ f'MMCV {mmcv.__version__} is incompatible with MMOCR {__version__}. ' \ f'Please use MMCV >= {mmcv_minimum_version}, ' \ f'<= {mmcv_maximum_version} instead.' @@ -61,7 +61,7 @@ mmdet_maximum_version = '3.0.0' mmdet_version = digit_version(mmdet.__version__) assert (mmdet_version >= digit_version(mmdet_minimum_version) - and mmdet_version <= digit_version(mmdet_maximum_version)), \ + and mmdet_version < digit_version(mmdet_maximum_version)), \ f'MMDetection {mmdet.__version__} is incompatible ' \ f'with MMOCR {__version__}. ' \ f'Please use MMDetection >= {mmdet_minimum_version}, ' \ diff --git a/mmocr/version.py b/mmocr/version.py index 3626dcd1..09efe185 100644 --- a/mmocr/version.py +++ b/mmocr/version.py @@ -1,4 +1,4 @@ # Copyright (c) Open-MMLab. All rights reserved. -__version__ = '0.6.0' +__version__ = '0.6.1' short_version = __version__ diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt index 74612e02..9d5f46f3 100644 --- a/requirements/mminstall.txt +++ b/requirements/mminstall.txt @@ -1,2 +1,2 @@ -mmcv-full>=1.3.8 -mmdet>=2.21.0 +mmcv-full>=1.3.8,<1.7.0 +mmdet>=2.21.0,<3.0.0