mirrors
/
mmocr
mirror of https://github.com/open-mmlab/mmocr.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Fix] Change MMEngine version limit (#1453) 

* [Fix] Change MMEngine version limit

* [Fix] Change MMEngine version limit

* [Fix] Change MMEngine version limit

* Apply suggestions from code review

Co-authored-by: Xinyu Wang <45810070+xinke-wang@users.noreply.github.com>

* fix

Co-authored-by: Xinyu Wang <45810070+xinke-wang@users.noreply.github.com>
pull/1454/head^2
Tong Gao 2022-10-14 14:15:37 +08:00 committed by GitHub
parent f619c697a5
commit 705ea79067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/test.yml
View File

@ -45,7 +45,7 @@ jobs:
name: Install Libraries
command: |
sudo apt-get update
sudo apt-get install -y ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libgl1-mesa-glx libjpeg-dev zlib1g-dev libtinfo-dev libncurses5
sudo apt-get install -y ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 libgl1-mesa-glx libjpeg-dev zlib1g-dev libtinfo-dev libncurses5 libgeos-dev
- run:
name: Configure Python & pip
command: |

12
docs/en/get_started/install.md
View File

@ -187,11 +187,11 @@ Run it with
docker run --gpus all --shm-size=8g -it -v {DATA_DIR}:/mmocr/data mmocr
```
## Dependency on MMCV & MMDetection
## Dependency on MMEngine, MMCV & MMDetection
MMOCR has different version requirements on MMCV and MMDetection at each release to guarantee the implementation correctness. Please refer to the table below and ensure the package versions fit the requirement.
MMOCR has different version requirements on MMEngine, MMCV and MMDetection at each release to guarantee the implementation correctness. Please refer to the table below and ensure the package versions fit the requirement.
| MMOCR | MMCV | MMDetection |
| ------------- | ----------------- | ------------------ |
| dev-1.x | 2.0.0rc1 \<= mmcv | 3.0.0rc0 \<= mmdet |
| 1.0.0rc0, rc1 | 2.0.0rc1 \<= mmcv | 3.0.0rc0 \<= mmdet |
| MMOCR | MMEngine | MMCV | MMDetection |
| ------------- | --------------------------- | -------------------------- | --------------------------- |
| dev-1.x | 0.1.0 \<= mmengine \< 1.0.0 | 2.0.0rc1 \<= mmcv \< 2.1.0 | 3.0.0rc0 \<= mmdet \< 3.1.0 |
| 1.0.0rc0, rc1 | 0.0.0 \<= mmengine \< 0.2.0 | 2.0.0rc1 \<= mmcv \< 2.1.0 | 3.0.0rc0 \<= mmdet \< 3.1.0 |

12
docs/zh_cn/get_started/install.md
View File

@ -188,11 +188,11 @@ docker build -t mmocr docker/
docker run --gpus all --shm-size=8g -it -v {实际数据目录}:/mmocr/data mmocr
```
## 对 MMCV 和 MMDetection 的版本依赖
## 对 MMEngine、MMCV 和 MMDetection 的版本依赖
为了确保代码实现的正确性，MMOCR 每个版本都有可能改变对 MMCV 和 MMDetection 版本的依赖。请根据以下表格确保版本之间的相互匹配。
为了确保代码实现的正确性，MMOCR 每个版本都有可能改变对 MMEngine、MMCV 和 MMDetection 版本的依赖。请根据以下表格确保版本之间的相互匹配。
| MMOCR | MMCV | MMDetection |
| ------------- | ----------------- | ------------------ |
| dev-1.x | 2.0.0rc1 \<= mmcv | 3.0.0rc0 \<= mmdet |
| 1.0.0rc0, rc1 | 2.0.0rc1 \<= mmcv | 3.0.0rc0 \<= mmdet |
| MMOCR | MMEngine | MMCV | MMDetection |
| ------------- | --------------------------- | -------------------------- | --------------------------- |
| dev-1.x | 0.1.0 \<= mmengine \< 1.0.0 | 2.0.0rc1 \<= mmcv \< 2.1.0 | 3.0.0rc0 \<= mmdet \< 3.1.0 |
| 1.0.0rc0, rc1 | 0.0.0 \<= mmengine \< 0.2.0 | 2.0.0rc1 \<= mmcv \< 2.1.0 | 3.0.0rc0 \<= mmdet \< 3.1.0 |

4
mmocr/__init__.py
View File

@ -10,8 +10,8 @@ from .version import __version__, short_version
mmcv_minimum_version = '2.0.0rc1'
mmcv_maximum_version = '2.1.0'
mmcv_version = digit_version(mmcv.__version__)
mmengine_minimum_version = '0.0.0'
mmengine_maximum_version = '0.2.0'
mmengine_minimum_version = '0.1.0'
mmengine_maximum_version = '1.0.0'
mmengine_version = digit_version(mmengine.__version__)
assert (mmcv_version >= digit_version(mmcv_minimum_version)

2
requirements/mminstall.txt
View File

@ -1,3 +1,3 @@
mmcv>==2.0.0rc1,<2.1.0
mmdet>=3.0.0rc0,<3.1.0
mmengine>= 0.1.0
mmengine>= 0.1.0, <1.0.0