Merge branch 'master' into v1.0.0.dev0

6d781bdd · Tai-Wang · e92268bf · dfcdef39 · 6d781bdd · 6d781bdd
Commit 6d781bdd authored Jan 05, 2022 by Tai-Wang
15 changed files
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -80,8 +80,8 @@ jobs:
      - name: Install mmdet3d dependencies
        run: |
          python -m pip install mmcv-full -f https://download.openmmlab.com/mmcv/dist/cu101/${{matrix.torch_version}}/index.html
-          python -m pip install mmdet==2.14.0
+          python -m pip install mmdet==2.19.0
-          python -m pip install mmsegmentation==0.14.1
+          python -m pip install mmsegmentation==0.20.0
          python -m pip install -r requirements.txt
      - name: Build and install
        run: |

--- a/README.md
+++ b/README.md
@@ -186,3 +186,6 @@ We wish that the toolbox and benchmark could serve the growing research communit
 - [MMFlow](https://github.com/open-mmlab/mmflow): OpenMMLab optical flow toolbox and benchmark.
 - [MMFewShot](https://github.com/open-mmlab/mmfewshot): OpenMMLab fewshot learning toolbox and benchmark.
 - [MMHuman3D](https://github.com/open-mmlab/mmhuman3d): OpenMMLab 3D human parametric model toolbox and benchmark.
+- [MMSelfSup](https://github.com/open-mmlab/mmselfsup): OpenMMLab self-supervised learning toolbox and benchmark.
+- [MMRazor](https://github.com/open-mmlab/mmrazor): OpenMMLab Model Compression Toolbox and Benchmark.
+- [MMDeploy](https://github.com/open-mmlab/mmdeploy): OpenMMLab Model Deployment Framework.
--- a/README_zh-CN.md
+++ b/README_zh-CN.md
@@ -184,6 +184,9 @@ MMDetection3D 是一款由来自不同高校和企业的研发人员共同参与
 - [MMFlow](https://github.com/open-mmlab/mmflow): OpenMMLab 光流估计工具箱与测试基准
 - [MMFewShot](https://github.com/open-mmlab/mmfewshot): OpenMMLab 少样本学习工具箱与测试基准
 - [MMHuman3D](https://github.com/open-mmlab/mmhuman3d): OpenMMLab 人体参数化模型工具箱与测试基准
+- [MMSelfSup](https://github.com/open-mmlab/mmselfsup): OpenMMLab 自监督学习工具箱与测试基准
+- [MMRazor](https://github.com/open-mmlab/mmrazor): OpenMMLab 模型压缩工具箱与测试基准
+- [MMDeploy](https://github.com/open-mmlab/mmdeploy): OpenMMLab 模型部署框架
 ## 欢迎加入 OpenMMLab 社区

--- a/docs/en/conf.py
+++ b/docs/en/conf.py
@@ -16,6 +16,7 @@ import subprocess
 import sys
 from m2r import MdInclude
 from recommonmark.transform import AutoStructify
+from sphinx.builders.html import StandaloneHTMLBuilder
 sys.path.insert(0, os.path.abspath('../../'))
@@ -130,6 +131,10 @@ latex_documents = [
     'manual'),
 ]
+# set priority when building html
+StandaloneHTMLBuilder.supported_image_types = [
+    'image/svg+xml', 'image/gif', 'image/png', 'image/jpeg'
+]
 # -- Extension configuration -------------------------------------------------
 # Ignore >>> when copying code
 copybutton_prompt_text = r'>>> |\.\.\. '

--- a/docs/en/getting_started.md
+++ b/docs/en/getting_started.md
@@ -12,7 +12,7 @@ The required versions of MMCV, MMDetection and MMSegmentation for different vers
 | MMDetection3D version | MMDetection version | MMSegmentation version |    MMCV version     |
 |:-------------------:|:-------------------:|:-------------------:|:-------------------:|
-| master              | mmdet>=2.14.0, <=3.0.0| mmseg>=0.14.1, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|
+| master              | mmdet>=2.19.0, <=3.0.0| mmseg>=0.20.0, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|
 | 0.17.3              | mmdet>=2.14.0, <=3.0.0| mmseg>=0.14.1, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|
 | 0.17.2              | mmdet>=2.14.0, <=3.0.0| mmseg>=0.14.1, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|
 | 0.17.1              | mmdet>=2.14.0, <=3.0.0| mmseg>=0.14.1, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|

--- a/docs/en/tutorials/data_pipeline.md
+++ b/docs/en/tutorials/data_pipeline.md
@@ -15,7 +15,7 @@ defines how to process the annotations and a data pipeline defines all the steps
 A pipeline consists of a sequence of operations. Each operation takes a dict as input and also output a dict for the next transform.
 We present a classical pipeline in the following figure. The blue blocks are pipeline operations. With the pipeline going on, each operator can add new keys (marked as green) to the result dict or update the existing keys (marked as orange).
-![](https://github.com/open-mmlab/mmdetection3d/blob/master/resources/data_pipeline.png)
+![](../../../resources/data_pipeline.png)
 The operations are categorized into data loading, pre-processing, formatting and test-time augmentation.

--- a/docs/en/useful_tools.md
+++ b/docs/en/useful_tools.md
@@ -4,7 +4,7 @@ We provide lots of useful tools under `tools/` directory.
 You can plot loss/mAP curves given a training log file. Run `pip install seaborn` first to install the dependency.
-![loss curve image](../resources/loss_curve.png)
+![loss curve image](../../resources/loss_curve.png)
 ```shell
 python tools/analysis_tools/analyze_logs.py plot_curve [--keys ${KEYS}] [--title ${TITLE}] [--legend ${LEGEND}] [--backend ${BACKEND}] [--style ${STYLE}] [--out ${OUT_FILE}] [--mode ${MODE}] [--interval ${INTERVAL}]
@@ -80,7 +80,7 @@ To visualize the results with `Open3D` backend, you can run the following comman
 python tools/misc/visualize_results.py ${CONFIG_FILE} --result ${RESULTS_PATH} --show-dir ${SHOW_DIR}
 ```
-![](../resources/open3d_visual.gif)
+![](../../resources/open3d_visual.*)
 Or you can use 3D visualization software such as the [MeshLab](http://www.meshlab.net/) to open these files under `${SHOW_DIR}` to see the 3D detection output. Specifically, open `***_points.obj` to see the input point cloud and open `***_pred.obj` to see the predicted 3D bounding boxes. This allows the inference and results generation to be done in remote server and the users can open them on their host with GUI.
@@ -108,7 +108,7 @@ If you also want to show 2D images with 3D bounding boxes projected onto them, y
 python tools/misc/browse_dataset.py configs/mvxnet/dv_mvx-fpn_second_secfpn_adamw_2x8_80e_kitti-3d-3class.py --task multi_modality-det --output-dir ${OUTPUT_DIR} --online
 ```
-![](../resources/browse_dataset_multi_modality.png)
+![](../../resources/browse_dataset_multi_modality.png)
 You can simply browse different datasets using different configs, e.g. visualizing the ScanNet dataset in 3D semantic segmentation task
@@ -116,7 +116,7 @@ You can simply browse different datasets using different configs, e.g. visualizi
 python tools/misc/browse_dataset.py configs/_base_/datasets/scannet_seg-3d-20class.py --task seg --output-dir ${OUTPUT_DIR} --online
 ```
-![](../resources/browse_dataset_seg.png)
+![](../../resources/browse_dataset_seg.png)
 And browsing the nuScenes dataset in monocular 3D detection task
@@ -124,7 +124,7 @@ And browsing the nuScenes dataset in monocular 3D detection task
 python tools/misc/browse_dataset.py configs/_base_/datasets/nus-mono3d.py --task mono-det --output-dir ${OUTPUT_DIR} --online
 ```
-![](../resources/browse_dataset_mono.png)
+![](../../resources/browse_dataset_mono.png)
 &emsp;

--- a/docs/zh_cn/conf.py
+++ b/docs/zh_cn/conf.py
@@ -16,6 +16,7 @@ import subprocess
 import sys
 from m2r import MdInclude
 from recommonmark.transform import AutoStructify
+from sphinx.builders.html import StandaloneHTMLBuilder
 sys.path.insert(0, os.path.abspath('../../'))
@@ -130,6 +131,10 @@ latex_documents = [
     'manual'),
 ]
+# set priority when building html
+StandaloneHTMLBuilder.supported_image_types = [
+    'image/svg+xml', 'image/gif', 'image/png', 'image/jpeg'
+]
 # -- Extension configuration -------------------------------------------------
 # Ignore >>> when copying code
 copybutton_prompt_text = r'>>> |\.\.\. '

--- a/docs/zh_cn/getting_started.md
+++ b/docs/zh_cn/getting_started.md
@@ -9,7 +9,7 @@
 | MMDetection3D version | MMDetection version | MMSegmentation version |    MMCV version     |
 |:-------------------:|:-------------------:|:-------------------:|:-------------------:|
-| master              | mmdet>=2.14.0, <=3.0.0| mmseg>=0.14.1, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|
+| master              | mmdet>=2.19.0, <=3.0.0| mmseg>=0.20.0, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|
 | 0.17.3              | mmdet>=2.14.0, <=3.0.0| mmseg>=0.14.1, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|
 | 0.17.2              | mmdet>=2.14.0, <=3.0.0| mmseg>=0.14.1, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|
 | 0.17.1              | mmdet>=2.14.0, <=3.0.0| mmseg>=0.14.1, <=1.0.0 | mmcv-full>=1.3.8, <=1.5.0|

--- a/docs/zh_cn/tutorials/data_pipeline.md
+++ b/docs/zh_cn/tutorials/data_pipeline.md
@@ -7,7 +7,7 @@
 数据预处理流程和数据集之间是互相分离的两个部分，通常数据集定义了如何处理标注信息，而数据预处理流程定义了准备数据项字典的所有步骤。数据集预处理流程包含一系列的操作，每个操作将一个字典作为输入，并输出应用于下一个转换的一个新的字典。
 我们将在下图中展示一个最经典的数据集预处理流程，其中蓝色框表示预处理流程中的各项操作。随着预处理的进行，每一个操作都会添加新的键值（图中标记为绿色）到输出字典中，或者更新当前存在的键值（图中标记为橙色）。
-![](https://github.com/open-mmlab/mmdetection3d/blob/master/resources/data_pipeline.png)
+![](../../../resources/data_pipeline.png)
 预处理流程中的各项操作主要分为数据加载、预处理、格式化、测试时的数据增强。

--- a/docs/zh_cn/useful_tools.md
+++ b/docs/zh_cn/useful_tools.md
@@ -4,7 +4,7 @@
 给定一个训练的日志文件，您可以绘制出 loss/mAP 曲线。首先需要运行 `pip install seaborn` 安装依赖包。
-![loss曲线图](../resources/loss_curve.png)
+![loss曲线图](../../resources/loss_curve.png)
 ```shell
 python tools/analysis_tools/analyze_logs.py plot_curve [--keys ${KEYS}] [--title ${TITLE}] [--legend ${LEGEND}] [--backend ${BACKEND}] [--style ${STYLE}] [--out ${OUT_FILE}] [--mode ${MODE}] [--interval ${INTERVAL}]
@@ -81,7 +81,7 @@ python tools/misc/visualize_results.py ${CONFIG_FILE} --result ${RESULTS_PATH} -
 ```
-![](../resources/open3d_visual.gif)
+![](../../resources/open3d_visual.*)
 或者您可以使用 3D 可视化软件，例如 [MeshLab](http://www.meshlab.net/) 来打开这些在 `${SHOW_DIR}` 目录下的文件，从而查看 3D 检测输出。具体来说，打开 `***_points.obj` 查看输入点云，打开 `***_pred.obj` 查看预测的 3D 边界框。这允许推理和结果生成在远程服务器中完成，用户可以使用 GUI 在他们的主机上打开它们。
@@ -109,7 +109,7 @@ python tools/misc/browse_dataset.py configs/_base_/datasets/kitti-3d-3class.py -
 python tools/misc/browse_dataset.py configs/mvxnet/dv_mvx-fpn_second_secfpn_adamw_2x8_80e_kitti-3d-3class.py --task multi_modality-det --output-dir ${OUTPUT_DIR} --online
 ```
-![](../resources/browse_dataset_multi_modality.png)
+![](../../resources/browse_dataset_multi_modality.png)
 您可以简单的使用不同的配置文件，浏览不同的数据集，例如：在 3D 语义分割任务中可视化 ScanNet 数据集
@@ -117,7 +117,7 @@ python tools/misc/browse_dataset.py configs/mvxnet/dv_mvx-fpn_second_secfpn_adam
 python tools/misc/browse_dataset.py configs/_base_/datasets/scannet_seg-3d-20class.py --task seg --output-dir ${OUTPUT_DIR} --online
 ```
-![](../resources/browse_dataset_seg.png)
+![](../../resources/browse_dataset_seg.png)
 在单目 3D 检测任务中浏览 nuScenes 数据集
@@ -125,7 +125,7 @@ python tools/misc/browse_dataset.py configs/_base_/datasets/scannet_seg-3d-20cla
 python tools/misc/browse_dataset.py configs/_base_/datasets/nus-mono3d.py --task mono-det --output-dir ${OUTPUT_DIR} --online
 ```
-![](../resources/browse_dataset_mono.png)
+![](../../resources/browse_dataset_mono.png)
 &emsp;

--- a/mmdet3d/__init__.py
+++ b/mmdet3d/__init__.py
@@ -28,7 +28,7 @@ assert (mmcv_version >= digit_version(mmcv_minimum_version)
    f'MMCV=={mmcv.__version__} is used but incompatible. ' \
    f'Please install mmcv>={mmcv_minimum_version}, <={mmcv_maximum_version}.'
-mmdet_minimum_version = '2.14.0'
+mmdet_minimum_version = '2.19.0'
 mmdet_maximum_version = '3.0.0'
 mmdet_version = digit_version(mmdet.__version__)
 assert (mmdet_version >= digit_version(mmdet_minimum_version)
@@ -37,7 +37,7 @@ assert (mmdet_version >= digit_version(mmdet_minimum_version)
    f'Please install mmdet>={mmdet_minimum_version}, ' \
    f'<={mmdet_maximum_version}.'
-mmseg_minimum_version = '0.14.1'
+mmseg_minimum_version = '0.20.0'
 mmseg_maximum_version = '1.0.0'
 mmseg_version = digit_version(mmseg.__version__)
 assert (mmseg_version >= digit_version(mmseg_minimum_version)

--- a/requirements/mminstall.txt
+++ b/requirements/mminstall.txt
 mmcv-full>=1.3.8,<=1.5.0
-mmdet>=2.14.0,<=3.0.0
+mmdet>=2.19.0,<=3.0.0
-mmsegmentation>=0.14.1,<=1.0.0
+mmsegmentation>=0.20.0,<=1.0.0
--- a/requirements/readthedocs.txt
+++ b/requirements/readthedocs.txt
 mmcv
 mmdet
-mmsegmentation>=0.14.1
+mmsegmentation>=0.20.1
 torch
 torchvision
--- a/resources/open3d_visual.png
+++ b/resources/open3d_visual.png