From 89588b60fbee67a079b9b530871002ad9bc13dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Haian=20Huang=28=E6=B7=B1=E5=BA=A6=E7=9C=B8=29?= Date: Thu, 27 Oct 2022 13:30:18 +0800 Subject: [PATCH] update mmengine/mmdet version and article (#201) * update mmengine and mmdet version * update --- .circleci/test.yml | 4 ++-- README.md | 2 +- README_zh-CN.md | 2 +- docker/Dockerfile | 2 +- docs/en/get_started.md | 7 ++++--- docs/en/user_guides/yolov5_tutorial.md | 4 ++-- docs/zh_cn/article.md | 20 ++++++++++++++++++++ docs/zh_cn/get_started.md | 7 ++++--- docs/zh_cn/user_guides/yolov5_tutorial.md | 4 ++-- mmyolo/__init__.py | 2 +- mmyolo/version.py | 2 +- requirements/mminstall.txt | 4 ++-- requirements/readthedocs.txt | 4 ++-- 13 files changed, 43 insertions(+), 21 deletions(-) diff --git a/.circleci/test.yml b/.circleci/test.yml index 448f71a2..d3d3a8dd 100644 --- a/.circleci/test.yml +++ b/.circleci/test.yml @@ -66,7 +66,7 @@ jobs: name: Install mmyolo dependencies command: | pip install -U openmim - mim install 'mmengine == 0.1.0' + mim install 'mmengine >= 0.2.0' mim install 'mmcv >= 2.0.0rc1' pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x pip install -r requirements/albu.txt @@ -124,7 +124,7 @@ jobs: name: Install mmyolo dependencies command: | docker exec mmyolo pip install -U openmim - docker exec mmyolo mim install 'mmengine == 0.1.0' + docker exec mmyolo mim install 'mmengine >= 0.2.0' docker exec mmyolo mim install 'mmcv >= 2.0.0rc1' docker exec mmyolo pip install -e /mmdetection docker exec mmyolo pip install -r requirements/albu.txt diff --git a/README.md b/README.md index 1fe013a3..10cfdd7d 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ MMYOLO relies on PyTorch, MMCV, MMEngine, and MMDetection. Below are quick steps conda create -n open-mmlab python=3.8 pytorch==1.10.1 torchvision==0.11.2 cudatoolkit=11.3 -c pytorch -y conda activate open-mmlab pip install openmim -mim install "mmengine==0.1.0" +mim install "mmengine>=0.2.0" mim install "mmcv>=2.0.0rc1,<2.1.0" mim install "mmdet>=3.0.0rc1,<3.1.0" git clone https://github.com/open-mmlab/mmyolo.git diff --git a/README_zh-CN.md b/README_zh-CN.md index 57acf7cc..0884258e 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -85,7 +85,7 @@ MMYOLO 依赖 PyTorch, MMCV, MMEngine 和 MMDetection，以下是安装的简要 conda create -n open-mmlab python=3.8 pytorch==1.10.1 torchvision==0.11.2 cudatoolkit=11.3 -c pytorch -y conda activate open-mmlab pip install openmim -mim install "mmengine==0.1.0" +mim install "mmengine>=0.2.0" mim install "mmcv>=2.0.0rc1,<2.1.0" mim install "mmdet>=3.0.0rc1,<3.1.0" git clone https://github.com/open-mmlab/mmyolo.git diff --git a/docker/Dockerfile b/docker/Dockerfile index 62e88f33..4843261a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update \ # Install MMEngine , MMCV and MMDet RUN pip install --no-cache-dir openmim && \ - mim install --no-cache-dir "mmengine==0.1.0" "mmcv>=2.0.0rc1,<2.1.0" "mmdet>=3.0.0rc1,<3.1.0" + mim install --no-cache-dir "mmengine>=0.2.0" "mmcv>=2.0.0rc1,<2.1.0" "mmdet>=3.0.0rc1,<3.1.0" # Install MMYOLO RUN git clone https://github.com/open-mmlab/mmyolo.git /mmyolo && \ diff --git a/docs/en/get_started.md b/docs/en/get_started.md index 15b5618f..61d7f4a0 100644 --- a/docs/en/get_started.md +++ b/docs/en/get_started.md @@ -6,7 +6,8 @@ Compatible MMEngine, MMCV and MMDetection versions are shown as below. Please in | MMYOLO version | MMDetection version | MMEngine version | MMCV version | | :------------: | :----------------------: | :----------------------: | :---------------------: | -| main | mmdet>=3.0.0rc1, \<3.1.0 | mmengine>=0.1.0, \<0.2.0 | mmcv>=2.0.0rc0, \<2.1.0 | +| main | mmdet>=3.0.0rc1, \<3.1.0 | mmengine>=0.2.0, \<1.0.0 | mmcv>=2.0.0rc0, \<2.1.0 | +| 0.1.2 | mmdet>=3.0.0rc1, \<3.1.0 | mmengine>=0.2.0, \<1.0.0 | mmcv>=2.0.0rc0, \<2.1.0 | | 0.1.1 | mmdet>=3.0.0rc1, \<3.1.0 | mmengine>=0.1.0, \<0.2.0 | mmcv>=2.0.0rc0, \<2.1.0 | | 0.1.0 | mmdet>=3.0.0rc0, \<3.1.0 | mmengine>=0.1.0, \<0.2.0 | mmcv>=2.0.0rc0, \<2.1.0 | @@ -49,7 +50,7 @@ conda install pytorch torchvision cpuonly -c pytorch ```shell pip install -U openmim -mim install "mmengine==0.1.0" +mim install "mmengine>=0.2.0" mim install "mmcv>=2.0.0rc1,<2.1.0" mim install "mmdet>=3.0.0rc1,<3.1.0" ``` @@ -155,7 +156,7 @@ To install MMEngine with pip instead of MIM, please follow \[MMEngine installati For example, you can install MMEngine by the following command. ```shell -pip install "mmengine==0.1.0" +pip install "mmengine>=0.2.0" ``` #### Install MMCV without MIM diff --git a/docs/en/user_guides/yolov5_tutorial.md b/docs/en/user_guides/yolov5_tutorial.md index 4d190bb9..af594ba4 100644 --- a/docs/en/user_guides/yolov5_tutorial.md +++ b/docs/en/user_guides/yolov5_tutorial.md @@ -10,9 +10,9 @@ conda activate open-mmlab conda install pytorch torchvision -c pytorch # conda install pytorch torchvision cpuonly -c pytorch pip install -U openmim -mim install "mmengine==0.1.0" +mim install "mmengine>=0.2.0" mim install "mmcv>=2.0.0rc1,<2.1.0" -mim install "mmdet>=3.0.0rc0,<3.1.0" +mim install "mmdet>=3.0.0rc1,<3.1.0" # for albumentations git clone https://github.com/open-mmlab/mmyolo.git cd mmyolo diff --git a/docs/zh_cn/article.md b/docs/zh_cn/article.md index f1dc9e83..042771e3 100644 --- a/docs/zh_cn/article.md +++ b/docs/zh_cn/article.md @@ -6,7 +6,9 @@ ### 文章 +- [社区协作，简洁易用，快来开箱新一代 YOLO 系列开源库](https://zhuanlan.zhihu.com/p/575615805) - [MMYOLO 社区倾情贡献，RTMDet 原理社区开发者解读来啦！](https://zhuanlan.zhihu.com/p/569777684) +- [玩转 MMYOLO 基础类第一期： 配置文件太复杂？继承用法看不懂？配置全解读来了](https://zhuanlan.zhihu.com/p/577715188) ### 视频 @@ -18,18 +20,36 @@ #### 基础类 +| | 内容 | 视频 | 课程中的代码/文档 | +| :---: | :--------: | :---------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------: | +| 第1讲 | 配置全解读 | [![Link](http://i1.hdslb.com/bfs/archive/e06daf640ea39b3c0700bb4dc758f1a253f33e13.jpg@112w_63h_1c.webp)](https://www.bilibili.com/video/BV1214y157ck) | [配置全解读文档](https://zhuanlan.zhihu.com/p/577715188) | + #### 实用类 #### 源码解读类 +#### 演示类 + +| | 内容 | 视频 | +| :---: | :----------: | :---------------------------------------------------------------------------------------------------------------------------------------------------: | +| 第1期 | 特征图可视化 | [![Link](http://i0.hdslb.com/bfs/archive/081f300c84d6556f40d984cfbe801fc0644ff449.jpg@112w_63h_1c.webp)](https://www.bilibili.com/video/BV1214y157ck) | + ## MMEngine 解读文章和资源 +- [从 MMCV 到 MMEngine，架构升级，体验升级！](https://zhuanlan.zhihu.com/p/571830155) + ## MMCV 解读文章和资源 +- [MMCV 全新升级，新增超全数据变换功能，还有两大变化](https://zhuanlan.zhihu.com/p/572550592) - [手把手教你如何高效地在 MMCV 中贡献算子](https://zhuanlan.zhihu.com/p/464492627) ## MMDetection 解读文章和资源 +## 文章 + +- [MMDetection 3.0：目标检测新基准与前沿](https://zhuanlan.zhihu.com/p/575246786) +- [MMDetection 支持数据增强神器 Simple Copy Paste 全过程](https://zhuanlan.zhihu.com/p/559940982) + ## 知乎问答和资源 - [深度学习科研，如何高效进行代码和实验管理？](https://www.zhihu.com/question/269707221/answer/2480772257) diff --git a/docs/zh_cn/get_started.md b/docs/zh_cn/get_started.md index 41ef6f01..dacf9f34 100644 --- a/docs/zh_cn/get_started.md +++ b/docs/zh_cn/get_started.md @@ -6,7 +6,8 @@ | MMYOLO version | MMDetection version | MMEngine version | MMCV version | | :------------: | :----------------------: | :----------------------: | :---------------------: | -| main | mmdet>=3.0.0rc1, \<3.1.0 | mmengine>=0.1.0, \<0.2.0 | mmcv>=2.0.0rc0, \<2.1.0 | +| main | mmdet>=3.0.0rc1, \<3.1.0 | mmengine>=0.2.0, \<1.0.0 | mmcv>=2.0.0rc0, \<2.1.0 | +| 0.1.2 | mmdet>=3.0.0rc1, \<3.1.0 | mmengine>=0.2.0, \<1.0.0 | mmcv>=2.0.0rc0, \<2.1.0 | | 0.1.1 | mmdet>=3.0.0rc1, \<3.1.0 | mmengine>=0.1.0, \<0.2.0 | mmcv>=2.0.0rc0, \<2.1.0 | | 0.1.0 | mmdet>=3.0.0rc0, \<3.1.0 | mmengine>=0.1.0, \<0.2.0 | mmcv>=2.0.0rc0, \<2.1.0 | @@ -49,7 +50,7 @@ conda install pytorch torchvision cpuonly -c pytorch ```shell pip install -U openmim -mim install "mmengine==0.1.0" +mim install "mmengine>=0.2.0" mim install "mmcv>=2.0.0rc1,<2.1.0" mim install "mmdet>=3.0.0rc1,<3.1.0" ``` @@ -157,7 +158,7 @@ inference_detector(model, 'demo/demo.jpg') 例如，你可以通过以下命令安装 MMEngine： ```shell -pip install "mmengine==0.1.0" +pip install "mmengine>=0.2.0" ``` #### 不使用 MIM 安装 MMCV diff --git a/docs/zh_cn/user_guides/yolov5_tutorial.md b/docs/zh_cn/user_guides/yolov5_tutorial.md index ca36be31..8db69201 100644 --- a/docs/zh_cn/user_guides/yolov5_tutorial.md +++ b/docs/zh_cn/user_guides/yolov5_tutorial.md @@ -10,9 +10,9 @@ conda activate open-mmlab conda install pytorch torchvision -c pytorch # conda install pytorch torchvision cpuonly -c pytorch pip install -U openmim -mim install "mmengine==0.1.0" +mim install "mmengine>=0.2.0" mim install "mmcv>=2.0.0rc1,<2.1.0" -mim install "mmdet>=3.0.0rc0,<3.1.0" +mim install "mmdet>=3.0.0rc1,<3.1.0" # for albumentations git clone https://github.com/open-mmlab/mmyolo.git cd mmyolo diff --git a/mmyolo/__init__.py b/mmyolo/__init__.py index 4f47f455..39ae5c4e 100644 --- a/mmyolo/__init__.py +++ b/mmyolo/__init__.py @@ -10,7 +10,7 @@ mmcv_minimum_version = '2.0.0rc0' mmcv_maximum_version = '2.1.0' mmcv_version = digit_version(mmcv.__version__) -mmengine_minimum_version = '0.1.0' +mmengine_minimum_version = '0.2.0' mmengine_maximum_version = '1.0.0' mmengine_version = digit_version(mmengine.__version__) diff --git a/mmyolo/version.py b/mmyolo/version.py index c4748be8..dd6b2919 100644 --- a/mmyolo/version.py +++ b/mmyolo/version.py @@ -1,6 +1,6 @@ # Copyright (c) OpenMMLab. All rights reserved. -__version__ = '0.1.1' +__version__ = '0.1.2' from typing import Tuple diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt index 48f0d15a..eef76637 100644 --- a/requirements/mminstall.txt +++ b/requirements/mminstall.txt @@ -1,3 +1,3 @@ mmcv>=2.0.0rc1,<2.1.0 -mmdet>=3.0.0rc0 -mmengine==0.1.0 +mmdet>=3.0.0rc1 +mmengine>=0.2.0 diff --git a/requirements/readthedocs.txt b/requirements/readthedocs.txt index 67d29485..d4cca9eb 100644 --- a/requirements/readthedocs.txt +++ b/requirements/readthedocs.txt @@ -1,5 +1,5 @@ mmcv>=2.0.0rc1,<2.1.0 -mmdet>=3.0.0rc0 -mmengine==0.1.0 +mmdet>=3.0.0rc1 +mmengine>=0.2.0 torch torchvision