From f0f09d0d9957446d31d9e3cf5591f24d88a609a3 Mon Sep 17 00:00:00 2001
From: AronLin <347630870@qq.com>
Date: Thu, 24 Feb 2022 12:16:21 +0800
Subject: [PATCH] Bump versions to v2.22.0
---
README.md | 11 +++++--
docker/Dockerfile | 2 +-
docker/serve/Dockerfile | 4 +--
docs/en/changelog.md | 32 +++++++++++++++++++
docs/en/compatibility.md | 5 +++
docs/en/get_started.md | 59 +++++++++++++++++------------------
docs/en/model_zoo.md | 14 ++++++++-
docs/zh_cn/compatibility.md | 5 +++
docs/zh_cn/get_started.md | 61 +++++++++++++++++++------------------
mmdet/__init__.py | 2 +-
mmdet/version.py | 2 +-
requirements/mminstall.txt | 2 +-
12 files changed, 130 insertions(+), 69 deletions(-)
diff --git a/README.md b/README.md
index 752b350d578..e22b2fb6db5 100644
--- a/README.md
+++ b/README.md
@@ -74,10 +74,13 @@ This project is released under the [Apache 2.0 license](LICENSE).
## Changelog
-**2.21.0** was released in 8/2/2022:
+**2.22.0** was released in 24/2/2022:
-- Support CPU training
-- Allow to set parameters about multi-processing to speed up training and testing
+- Support MaskFormer
+- Support DyHead
+- Support OpenImage Dataset
+- Support visualization for Panoptic Segmentation
+- Support TIMM backbone
Please refer to [changelog.md](docs/en/changelog.md) for details and release history.
@@ -142,6 +145,7 @@ Results and models are available in the [model zoo](docs/en/model_zoo.md).
YOLOX (CVPR'2021)
Deformable DETR (ICLR'2021)
TOOD (ICCV'2021)
+ DyHead (CVPR'2021)
|
@@ -162,6 +166,7 @@ Results and models are available in the [model zoo](docs/en/model_zoo.md).
|
|
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5ee7a370e0e..81cb40bad84 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build
# Install MMCV
RUN pip install --no-cache-dir --upgrade pip wheel setuptools
-RUN pip install --no-cache-dir mmcv-full==1.3.17 -f https://download.openmmlab.com/mmcv/dist/cu101/torch1.6.0/index.html
+RUN pip install --no-cache-dir mmcv-full==1.4.4 -f https://download.openmmlab.com/mmcv/dist/cu101/torch1.6.0/index.html
# Install MMDetection
RUN conda clean --all
diff --git a/docker/serve/Dockerfile b/docker/serve/Dockerfile
index 9776ac43096..307d11aba32 100644
--- a/docker/serve/Dockerfile
+++ b/docker/serve/Dockerfile
@@ -3,8 +3,8 @@ ARG CUDA="10.1"
ARG CUDNN="7"
FROM pytorch/pytorch:${PYTORCH}-cuda${CUDA}-cudnn${CUDNN}-devel
-ARG MMCV="1.3.17"
-ARG MMDET="2.21.0"
+ARG MMCV="1.4.4"
+ARG MMDET="2.22.0"
ENV PYTHONUNBUFFERED TRUE
diff --git a/docs/en/changelog.md b/docs/en/changelog.md
index 012557212ff..623096abf30 100644
--- a/docs/en/changelog.md
+++ b/docs/en/changelog.md
@@ -1,5 +1,37 @@
## Changelog
+### v2.22.0 (24/2/2022)
+
+### Breaking Changes
+
+In order to support the visualization for Panoptic Segmentation, the `num_classes` can not be `None` when using the `get_palette` function to determine whether to use the panoptic palette.
+
+#### New Features
+
+- Support MaskFormer (#7212)
+- Support DyHead (#6823)
+- Support OpenImage Dataset (#6331)
+- Support visualization for Panoptic Segmentation (#7041)
+- Support TIMM backbone (#7020)
+
+#### Bug Fixes
+
+- Fix bug for the best checkpoints can not be saved when the `key_score` is None (#7101)
+- Fix MixUp transform filter boxes failing case (#7080)
+- Add missing properties in SABLHead (#7091)
+- Fix bug when NaNs exist in confusion matrix (#7147)
+- Fix PALETTE AttributeError in downstream task (#7230)
+
+#### Improvements
+
+- Speed up SimOTA matching (#7098)
+
+#### Contributors
+
+A total of 17 developers contributed to this release.
+Thanks @ZwwWayne, @hhaAndroid, @RangiLyu, @AronLin, @BIGWangYuDong, @jbwang1997, @chhluo, @shinya7y, @LuooChen, @dvansam, @siatwangmin, @del-zhenwu, @vikashranjan26, @haofanwang, @jamiechoi1995, @HJoonKwon, @zytx121
+
+
### v2.21.0 (8/2/2022)
### Breaking Changes
diff --git a/docs/en/compatibility.md b/docs/en/compatibility.md
index 3d6b9459849..a4f297690d9 100644
--- a/docs/en/compatibility.md
+++ b/docs/en/compatibility.md
@@ -1,5 +1,10 @@
# Compatibility of MMDetection 2.x
+## MMDetection 2.21.0
+
+In order to support CPU training, the logic of scatter in batch collating has been changed. We recommend to use
+MMCV v1.4.4 or higher. For more details, please refer to [MMCV PR #1621](https://github.com/open-mmlab/mmcv/pull/1621).
+
## MMDetection 2.18.1
### MMCV compatibility
diff --git a/docs/en/get_started.md b/docs/en/get_started.md
index 153ecfa85e3..e4b85cff165 100644
--- a/docs/en/get_started.md
+++ b/docs/en/get_started.md
@@ -9,35 +9,36 @@
Compatible MMDetection and MMCV versions are shown as below. Please install the correct version of MMCV to avoid installation issues.
-| MMDetection version | MMCV version |
-|:-------------------:|:-------------------:|
-| master | mmcv-full>=1.3.17, <1.5.0 |
-| 2.21.0 | mmcv-full>=1.3.17, <1.5.0 |
-| 2.20.0 | mmcv-full>=1.3.17, <1.5.0 |
-| 2.19.1 | mmcv-full>=1.3.17, <1.5.0 |
-| 2.19.0 | mmcv-full>=1.3.17, <1.5.0 |
-| 2.18.0 | mmcv-full>=1.3.17, <1.4.0 |
-| 2.17.0 | mmcv-full>=1.3.14, <1.4.0 |
-| 2.16.0 | mmcv-full>=1.3.8, <1.4.0 |
-| 2.15.1 | mmcv-full>=1.3.8, <1.4.0 |
-| 2.15.0 | mmcv-full>=1.3.8, <1.4.0 |
-| 2.14.0 | mmcv-full>=1.3.8, <1.4.0 |
-| 2.13.0 | mmcv-full>=1.3.3, <1.4.0 |
-| 2.12.0 | mmcv-full>=1.3.3, <1.4.0 |
-| 2.11.0 | mmcv-full>=1.2.4, <1.4.0 |
-| 2.10.0 | mmcv-full>=1.2.4, <1.4.0 |
-| 2.9.0 | mmcv-full>=1.2.4, <1.4.0 |
-| 2.8.0 | mmcv-full>=1.2.4, <1.4.0 |
-| 2.7.0 | mmcv-full>=1.1.5, <1.4.0 |
-| 2.6.0 | mmcv-full>=1.1.5, <1.4.0 |
-| 2.5.0 | mmcv-full>=1.1.5, <1.4.0 |
-| 2.4.0 | mmcv-full>=1.1.1, <1.4.0 |
-| 2.3.0 | mmcv-full==1.0.5 |
-| 2.3.0rc0 | mmcv-full>=1.0.2 |
-| 2.2.1 | mmcv==0.6.2 |
-| 2.2.0 | mmcv==0.6.2 |
-| 2.1.0 | mmcv>=0.5.9, <=0.6.1|
-| 2.0.0 | mmcv>=0.5.1, <=0.5.8|
+| MMDetection version | MMCV version |
+|:-------------------:|:-------------------------:|
+| master | mmcv-full>=1.4.4, <1.5.0 |
+| 2.22.0 | mmcv-full>=1.4.4, <1.5.0 |
+| 2.21.0 | mmcv-full>=1.4.4, <1.5.0 |
+| 2.20.0 | mmcv-full>=1.3.17, <1.5.0 |
+| 2.19.1 | mmcv-full>=1.3.17, <1.5.0 |
+| 2.19.0 | mmcv-full>=1.3.17, <1.5.0 |
+| 2.18.0 | mmcv-full>=1.3.17, <1.4.0 |
+| 2.17.0 | mmcv-full>=1.3.14, <1.4.0 |
+| 2.16.0 | mmcv-full>=1.3.8, <1.4.0 |
+| 2.15.1 | mmcv-full>=1.3.8, <1.4.0 |
+| 2.15.0 | mmcv-full>=1.3.8, <1.4.0 |
+| 2.14.0 | mmcv-full>=1.3.8, <1.4.0 |
+| 2.13.0 | mmcv-full>=1.3.3, <1.4.0 |
+| 2.12.0 | mmcv-full>=1.3.3, <1.4.0 |
+| 2.11.0 | mmcv-full>=1.2.4, <1.4.0 |
+| 2.10.0 | mmcv-full>=1.2.4, <1.4.0 |
+| 2.9.0 | mmcv-full>=1.2.4, <1.4.0 |
+| 2.8.0 | mmcv-full>=1.2.4, <1.4.0 |
+| 2.7.0 | mmcv-full>=1.1.5, <1.4.0 |
+| 2.6.0 | mmcv-full>=1.1.5, <1.4.0 |
+| 2.5.0 | mmcv-full>=1.1.5, <1.4.0 |
+| 2.4.0 | mmcv-full>=1.1.1, <1.4.0 |
+| 2.3.0 | mmcv-full==1.0.5 |
+| 2.3.0rc0 | mmcv-full>=1.0.2 |
+| 2.2.1 | mmcv==0.6.2 |
+| 2.2.0 | mmcv==0.6.2 |
+| 2.1.0 | mmcv>=0.5.9, <=0.6.1 |
+| 2.0.0 | mmcv>=0.5.1, <=0.5.8 |
**Note:** You need to run `pip uninstall mmcv` first if you have mmcv installed.
If mmcv and mmcv-full are both installed, there will be `ModuleNotFoundError`.
diff --git a/docs/en/model_zoo.md b/docs/en/model_zoo.md
index 4ef4aacff45..15bb4894ae0 100644
--- a/docs/en/model_zoo.md
+++ b/docs/en/model_zoo.md
@@ -242,9 +242,21 @@ Please refer to [SOLO](https://github.com/open-mmlab/mmdetection/blob/master/con
Please refer to [QueryInst](https://github.com/open-mmlab/mmdetection/blob/master/configs/queryinst) for details.
+### PanopticFPN
+
+Please refer to [PanopticFPN](https://github.com/open-mmlab/mmdetection/blob/master/configs/panoptic_fpn) for details.
+
+### MaskFormer
+
+Please refer to [MaskFormer](https://github.com/open-mmlab/mmdetection/blob/master/configs/maskformer) for details.
+
+### DyHead
+
+Please refer to [DyHead](https://github.com/open-mmlab/mmdetection/blob/master/configs/dyhead) for details.
+
### Other datasets
-We also benchmark some methods on [PASCAL VOC](https://github.com/open-mmlab/mmdetection/blob/master/configs/pascal_voc), [Cityscapes](https://github.com/open-mmlab/mmdetection/blob/master/configs/cityscapes) and [WIDER FACE](https://github.com/open-mmlab/mmdetection/blob/master/configs/wider_face).
+We also benchmark some methods on [PASCAL VOC](https://github.com/open-mmlab/mmdetection/blob/master/configs/pascal_voc), [Cityscapes](https://github.com/open-mmlab/mmdetection/blob/master/configs/cityscapes), [OpenImages](https://github.com/open-mmlab/mmdetection/blob/master/configs/openimages) and [WIDER FACE](https://github.com/open-mmlab/mmdetection/blob/master/configs/wider_face).
### Pre-trained Models
diff --git a/docs/zh_cn/compatibility.md b/docs/zh_cn/compatibility.md
index 80acf7f1a0e..73e1e628c7d 100644
--- a/docs/zh_cn/compatibility.md
+++ b/docs/zh_cn/compatibility.md
@@ -1,5 +1,10 @@
# MMDetection v2.x 兼容性说明
+## MMDection 2.21.0
+
+为了支持 CPU 训练，MMCV 中进行批处理的 scatter 的代码逻辑已经被修改。我们推荐使用 MMCV v1.4.4 或更高版本，
+更多信息请参考 [MMCV PR #1621](https://github.com/open-mmlab/mmcv/pull/1621).
+
## MMDetection 2.18.1
### MMCV compatibility
diff --git a/docs/zh_cn/get_started.md b/docs/zh_cn/get_started.md
index 8408007c707..d39dffcf30e 100644
--- a/docs/zh_cn/get_started.md
+++ b/docs/zh_cn/get_started.md
@@ -9,36 +9,37 @@
MMDetection 和 MMCV 版本兼容性如下所示，需要安装正确的 MMCV 版本以避免安装出现问题。
-| MMDetection 版本 | MMCV 版本 |
-| :--------------: | :----------------------: |
-| master | mmcv-full>=1.3.17, <1.5.0 |
-| 2.21.0 | mmcv-full>=1.3.17, <1.5.0 |
-| 2.20.0 | mmcv-full>=1.3.17, <1.5.0 |
-| 2.19.1 | mmcv-full>=1.3.17, <1.5.0 |
-| 2.19.0 | mmcv-full>=1.3.17, <1.5.0 |
-| 2.18.1 | mmcv-full>=1.3.17, <1.4.0 |
-| 2.18.0 | mmcv-full>=1.3.14, <1.4.0 |
-| 2.17.0 | mmcv-full>=1.3.14, <1.4.0 |
-| 2.16.0 | mmcv-full>=1.3.8, <1.4.0 |
-| 2.15.1 | mmcv-full>=1.3.8, <1.4.0 |
-| 2.15.0 | mmcv-full>=1.3.8, <1.4.0 |
-| 2.14.0 | mmcv-full>=1.3.8, <1.4.0 |
-| 2.13.0 | mmcv-full>=1.3.3, <1.4.0 |
-| 2.12.0 | mmcv-full>=1.3.3, <1.4.0 |
-| 2.11.0 | mmcv-full>=1.2.4, <1.4.0 |
-| 2.10.0 | mmcv-full>=1.2.4, <1.4.0 |
-| 2.9.0 | mmcv-full>=1.2.4, <1.4.0 |
-| 2.8.0 | mmcv-full>=1.2.4, <1.4.0 |
-| 2.7.0 | mmcv-full>=1.1.5, <1.4.0 |
-| 2.6.0 | mmcv-full>=1.1.5, <1.4.0 |
-| 2.5.0 | mmcv-full>=1.1.5, <1.4.0 |
-| 2.4.0 | mmcv-full>=1.1.1, <1.4.0 |
-| 2.3.0 | mmcv-full==1.0.5 |
-| 2.3.0rc0 | mmcv-full>=1.0.2 |
-| 2.2.1 | mmcv==0.6.2 |
-| 2.2.0 | mmcv==0.6.2 |
-| 2.1.0 | mmcv>=0.5.9, <=0.6.1 |
-| 2.0.0 | mmcv>=0.5.1, <=0.5.8 |
+| MMDetection 版本 | MMCV 版本 |
+|:--------------:|:-------------------------:|
+| master | mmcv-full>=1.3.17, <1.5.0 |
+| 2.22.0 | mmcv-full>=1.4.4, <1.5.0 |
+| 2.21.0 | mmcv-full>=1.4.4, <1.5.0 |
+| 2.20.0 | mmcv-full>=1.3.17, <1.5.0 |
+| 2.19.1 | mmcv-full>=1.3.17, <1.5.0 |
+| 2.19.0 | mmcv-full>=1.3.17, <1.5.0 |
+| 2.18.1 | mmcv-full>=1.3.17, <1.4.0 |
+| 2.18.0 | mmcv-full>=1.3.14, <1.4.0 |
+| 2.17.0 | mmcv-full>=1.3.14, <1.4.0 |
+| 2.16.0 | mmcv-full>=1.3.8, <1.4.0 |
+| 2.15.1 | mmcv-full>=1.3.8, <1.4.0 |
+| 2.15.0 | mmcv-full>=1.3.8, <1.4.0 |
+| 2.14.0 | mmcv-full>=1.3.8, <1.4.0 |
+| 2.13.0 | mmcv-full>=1.3.3, <1.4.0 |
+| 2.12.0 | mmcv-full>=1.3.3, <1.4.0 |
+| 2.11.0 | mmcv-full>=1.2.4, <1.4.0 |
+| 2.10.0 | mmcv-full>=1.2.4, <1.4.0 |
+| 2.9.0 | mmcv-full>=1.2.4, <1.4.0 |
+| 2.8.0 | mmcv-full>=1.2.4, <1.4.0 |
+| 2.7.0 | mmcv-full>=1.1.5, <1.4.0 |
+| 2.6.0 | mmcv-full>=1.1.5, <1.4.0 |
+| 2.5.0 | mmcv-full>=1.1.5, <1.4.0 |
+| 2.4.0 | mmcv-full>=1.1.1, <1.4.0 |
+| 2.3.0 | mmcv-full==1.0.5 |
+| 2.3.0rc0 | mmcv-full>=1.0.2 |
+| 2.2.1 | mmcv==0.6.2 |
+| 2.2.0 | mmcv==0.6.2 |
+| 2.1.0 | mmcv>=0.5.9, <=0.6.1 |
+| 2.0.0 | mmcv>=0.5.1, <=0.5.8 |
**注意：**如果已经安装了 mmcv，首先需要使用 `pip uninstall mmcv` 卸载已安装的 mmcv，如果同时安装了 mmcv 和 mmcv-full，将会报 `ModuleNotFoundError` 错误。
diff --git a/mmdet/__init__.py b/mmdet/__init__.py
index ca5518fc31d..87de373c5b2 100644
--- a/mmdet/__init__.py
+++ b/mmdet/__init__.py
@@ -16,7 +16,7 @@ def digit_version(version_str):
return digit_version
-mmcv_minimum_version = '1.3.17'
+mmcv_minimum_version = '1.4.4'
mmcv_maximum_version = '1.5.0'
mmcv_version = digit_version(mmcv.__version__)
diff --git a/mmdet/version.py b/mmdet/version.py
index dd1bcd49098..7618b043734 100644
--- a/mmdet/version.py
+++ b/mmdet/version.py
@@ -1,6 +1,6 @@
# Copyright (c) OpenMMLab. All rights reserved.
-__version__ = '2.21.0'
+__version__ = '2.22.0'
short_version = __version__
diff --git a/requirements/mminstall.txt b/requirements/mminstall.txt
index b53dbf4108e..6a832cefe0e 100644
--- a/requirements/mminstall.txt
+++ b/requirements/mminstall.txt
@@ -1 +1 @@
-mmcv-full>=1.3.17
+mmcv-full>=1.4.4
|