Skip to content

Commit ca11860

Browse files
authored
Bump version to v2.25.0
Bump version to v2.25.0
2 parents 240d7a3 + 5970e09 commit ca11860

File tree

235 files changed

+8251
-2606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+8251
-2606
lines changed

Diff for: .circleci/config.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ jobs:
66
- image: cimg/python:3.7.4
77
steps:
88
- checkout
9-
- run:
10-
name: Install dependencies
11-
command: |
12-
sudo apt-add-repository ppa:brightbox/ruby-ng -y
13-
sudo apt-get update
14-
sudo apt-get install -y ruby2.7
159
- run:
1610
name: Install pre-commit hook
1711
command: |
@@ -61,7 +55,7 @@ jobs:
6155
condition:
6256
equal: [ "3.9.0", << parameters.python >> ]
6357
steps:
64-
- run: pip install protobuf && sudo apt-get update && sudo apt-get -y install libprotobuf-dev protobuf-compiler cmake
58+
- run: pip install "protobuf <= 3.20.1" && sudo apt-get update && sudo apt-get -y install libprotobuf-dev protobuf-compiler cmake
6559
- run:
6660
name: Install mmdet dependencies
6761
command: |

Diff for: .dev_scripts/gather_models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def main():
269269
# when using Panoptic Dataset, the evaluation key is 'PQ'.
270270
for i, key in enumerate(results_lut):
271271
if 'mAP' not in key and 'PQ' not in key:
272-
results_lut[i] = key + 'm_AP'
272+
results_lut[i] = key + '_mAP'
273273
model_performance = get_final_results(log_json_path,
274274
final_epoch_or_iter, results_lut,
275275
by_epoch)

Diff for: .github/CODE_OF_CONDUCT.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
1414
Examples of behavior that contributes to creating a positive environment
1515
include:
1616

17-
* Using welcoming and inclusive language
18-
* Being respectful of differing viewpoints and experiences
19-
* Gracefully accepting constructive criticism
20-
* Focusing on what is best for the community
21-
* Showing empathy towards other community members
17+
- Using welcoming and inclusive language
18+
- Being respectful of differing viewpoints and experiences
19+
- Gracefully accepting constructive criticism
20+
- Focusing on what is best for the community
21+
- Showing empathy towards other community members
2222

2323
Examples of unacceptable behavior by participants include:
2424

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
* Trolling, insulting/derogatory comments, and personal or political attacks
28-
* Public or private harassment
29-
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
25+
- The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
- Trolling, insulting/derogatory comments, and personal or political attacks
28+
- Public or private harassment
29+
- Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
- Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
3333

3434
## Our Responsibilities
3535

@@ -70,7 +70,7 @@ members of the project's leadership.
7070
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
7171
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
7272

73-
[homepage]: https://www.contributor-covenant.org
74-
7573
For answers to common questions about this code of conduct, see
7674
https://www.contributor-covenant.org/faq
75+
76+
[homepage]: https://www.contributor-covenant.org

Diff for: .github/ISSUE_TEMPLATE/error-report.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Create a report to help us improve
44
title: ''
55
labels: ''
66
assignees: ''
7-
87
---
98

109
Thanks for your error report and we appreciate it a lot.
@@ -33,8 +32,8 @@ A placeholder for the command.
3332

3433
1. Please run `python mmdet/utils/collect_env.py` to collect necessary environment information and paste it here.
3534
2. You may add addition that may be helpful for locating the problem, such as
36-
- How you installed PyTorch [e.g., pip, conda, source]
37-
- Other environment variables that may be related (such as `$PATH`, `$LD_LIBRARY_PATH`, `$PYTHONPATH`, etc.)
35+
- How you installed PyTorch \[e.g., pip, conda, source\]
36+
- Other environment variables that may be related (such as `$PATH`, `$LD_LIBRARY_PATH`, `$PYTHONPATH`, etc.)
3837

3938
**Error traceback**
4039
If applicable, paste the error trackback here.

Diff for: .github/ISSUE_TEMPLATE/feature_request.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ about: Suggest an idea for this project
44
title: ''
55
labels: ''
66
assignees: ''
7-
87
---
98

109
**Describe the feature**
1110

1211
**Motivation**
1312
A clear and concise description of the motivation of the feature.
14-
Ex1. It is inconvenient when [....].
15-
Ex2. There is a recent paper [....], which is very helpful for [....].
13+
Ex1. It is inconvenient when \[....\].
14+
Ex2. There is a recent paper \[....\], which is very helpful for \[....\].
1615

1716
**Related resources**
1817
If there is an official code release or third-party implementations, please also provide the information here, which would be very helpful.

Diff for: .github/ISSUE_TEMPLATE/general_questions.md

-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ about: Ask general questions to get help
44
title: ''
55
labels: ''
66
assignees: ''
7-
87
---

Diff for: .github/ISSUE_TEMPLATE/reimplementation_questions.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
name: Reimplementation Questions
33
about: Ask about questions during model reimplementation
44
title: ''
5-
labels: 'reimplementation'
5+
labels: reimplementation
66
assignees: ''
7-
87
---
98

109
**Notice**
@@ -52,7 +51,7 @@ A placeholder for the config.
5251

5352
1. Please run `python mmdet/utils/collect_env.py` to collect necessary environment information and paste it here.
5453
2. You may add addition that may be helpful for locating the problem, such as
55-
1. How you installed PyTorch [e.g., pip, conda, source]
54+
1. How you installed PyTorch \[e.g., pip, conda, source\]
5655
2. Other environment variables that may be related (such as `$PATH`, `$LD_LIBRARY_PATH`, `$PYTHONPATH`, etc.)
5756

5857
**Results**

Diff for: .github/workflows/build.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ jobs:
114114
uses: actions/setup-python@v2
115115
with:
116116
python-version: ${{ matrix.python-version }}
117+
- name: Fetch GPG keys
118+
run: |
119+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
120+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
117121
- name: Install system dependencies
118122
run: |
119123
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6 python${{matrix.python-version}}-dev
@@ -125,7 +129,7 @@ jobs:
125129
- name: Install PyTorch
126130
run: python -m pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html
127131
- name: Install dependencies for compiling onnx when python=3.9
128-
run: python -m pip install protobuf && apt-get install libprotobuf-dev protobuf-compiler
132+
run: python -m pip install "protobuf <= 3.20.1" && apt-get install libprotobuf-dev protobuf-compiler
129133
if: ${{matrix.python-version == '3.9'}}
130134
- name: Install mmdet dependencies
131135
run: |
@@ -180,6 +184,10 @@ jobs:
180184
uses: actions/setup-python@v2
181185
with:
182186
python-version: ${{ matrix.python-version }}
187+
- name: Fetch GPG keys
188+
run: |
189+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
190+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
183191
# Add ppa source repo for python3.9.
184192
- name: Add python3.9 source
185193
run: |
@@ -202,7 +210,7 @@ jobs:
202210
- name: Install PyTorch
203211
run: python -m pip install torch==${{matrix.torch}} torchvision==${{matrix.torchvision}} -f https://download.pytorch.org/whl/torch_stable.html
204212
- name: Install dependencies for compiling onnx when python=3.9
205-
run: python -m pip install protobuf && apt-get update && apt-get -y install libprotobuf-dev protobuf-compiler cmake
213+
run: python -m pip install "protobuf <= 3.20.1" && apt-get update && apt-get -y install libprotobuf-dev protobuf-compiler cmake
206214
if: ${{matrix.python-version == '3.9'}}
207215
- name: Install mmdet dependencies
208216
run: |
@@ -246,7 +254,7 @@ jobs:
246254
with:
247255
python-version: ${{ matrix.python }}
248256
- name: Upgrade pip
249-
run: pip install pip --upgrade --user
257+
run: python -m pip install pip --upgrade --user
250258
- name: Install PyTorch
251259
# As a complement to Linux CI, we test on PyTorch LTS version
252260
run: pip install torch==1.8.2+${{ matrix.platform }} torchvision==0.9.2+${{ matrix.platform }} -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html

Diff for: .pre-commit-config.yaml

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
repos:
2-
- repo: https://gitlab.com/pycqa/flake8.git
2+
- repo: https://github.com/PyCQA/flake8
33
rev: 3.8.3
44
hooks:
55
- id: flake8
@@ -24,16 +24,19 @@ repos:
2424
args: ["--remove"]
2525
- id: mixed-line-ending
2626
args: ["--fix=lf"]
27-
- repo: https://github.com/markdownlint/markdownlint
28-
rev: v0.11.0
29-
hooks:
30-
- id: markdownlint
31-
args: ["-r", "~MD002,~MD013,~MD029,~MD033,~MD034",
32-
"-t", "allow_different_nesting"]
3327
- repo: https://github.com/codespell-project/codespell
3428
rev: v2.1.0
3529
hooks:
3630
- id: codespell
31+
- repo: https://github.com/executablebooks/mdformat
32+
rev: 0.7.14
33+
hooks:
34+
- id: mdformat
35+
args: ["--number"]
36+
additional_dependencies:
37+
- mdformat-gfm
38+
- mdformat_frontmatter
39+
- linkify-it-py
3740
- repo: https://github.com/myint/docformatter
3841
rev: v1.3.1
3942
hooks:

Diff for: README.md

+55-30
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<img src="resources/mmdet-logo.png" width="600"/>
33
<div>&nbsp;</div>
44
<div align="center">
5-
<b>OpenMMLab website</b>
5+
<b><font size="5">OpenMMLab website</font></b>
66
<sup>
77
<a href="https://openmmlab.com">
8-
<i>HOT</i>
8+
<i><font size="4">HOT</font></i>
99
</a>
1010
</sup>
1111
&nbsp;&nbsp;&nbsp;&nbsp;
12-
<b>OpenMMLab platform</b>
12+
<b><font size="5">OpenMMLab platform</font></b>
1313
<sup>
1414
<a href="https://platform.openmmlab.com">
15-
<i>TRY IT OUT</i>
15+
<i><font size="4">TRY IT OUT</font></i>
1616
</a>
1717
</sup>
1818
</div>
@@ -24,27 +24,32 @@
2424
[![codecov](https://codecov.io/gh/open-mmlab/mmdetection/branch/master/graph/badge.svg)](https://codecov.io/gh/open-mmlab/mmdetection)
2525
[![license](https://img.shields.io/github/license/open-mmlab/mmdetection.svg)](https://github.com/open-mmlab/mmdetection/blob/master/LICENSE)
2626
[![open issues](https://isitmaintained.com/badge/open/open-mmlab/mmdetection.svg)](https://github.com/open-mmlab/mmdetection/issues)
27+
[![issue resolution](https://isitmaintained.com/badge/resolution/open-mmlab/mmdetection.svg)](https://github.com/open-mmlab/mmdetection/issues)
2728

28-
<img src="https://user-images.githubusercontent.com/12907710/137271636-56ba1cd2-b110-4812-8221-b4c120320aa9.png"/>
29-
30-
[📘Documentation](https://mmdetection.readthedocs.io/en/v2.21.0/) |
31-
[🛠️Installation](https://mmdetection.readthedocs.io/en/v2.21.0/get_started.html) |
32-
[👀Model Zoo](https://mmdetection.readthedocs.io/en/v2.21.0/model_zoo.html) |
33-
[🆕Update News](https://mmdetection.readthedocs.io/en/v2.21.0/changelog.html) |
29+
[📘Documentation](https://mmdetection.readthedocs.io/en/stable/) |
30+
[🛠️Installation](https://mmdetection.readthedocs.io/en/stable/get_started.html) |
31+
[👀Model Zoo](https://mmdetection.readthedocs.io/en/stable/model_zoo.html) |
32+
[🆕Update News](https://mmdetection.readthedocs.io/en/stable/changelog.html) |
3433
[🚀Ongoing Projects](https://github.com/open-mmlab/mmdetection/projects) |
3534
[🤔Reporting Issues](https://github.com/open-mmlab/mmdetection/issues/new/choose)
3635

3736
</div>
3837

39-
## Introduction
38+
<div align="center">
4039

4140
English | [简体中文](README_zh-CN.md)
4241

42+
</div>
43+
44+
## Introduction
45+
4346
MMDetection is an open source object detection toolbox based on PyTorch. It is
4447
a part of the [OpenMMLab](https://openmmlab.com/) project.
4548

4649
The master branch works with **PyTorch 1.5+**.
4750

51+
<img src="https://user-images.githubusercontent.com/12907710/137271636-56ba1cd2-b110-4812-8221-b4c120320aa9.png"/>
52+
4853
<details open>
4954
<summary>Major features</summary>
5055

@@ -68,22 +73,42 @@ The master branch works with **PyTorch 1.5+**.
6873

6974
Apart from MMDetection, we also released a library [mmcv](https://github.com/open-mmlab/mmcv) for computer vision research, which is heavily depended on by this toolbox.
7075

71-
## License
72-
73-
This project is released under the [Apache 2.0 license](LICENSE).
74-
75-
## Changelog
76+
## What's New
7677

77-
**2.24.1** was released in 30/4/2022:
78+
**2.25.0** was released in 1/6/2022:
7879

79-
- Support [Simple Copy Paste](configs/simple_copy_paste)
80-
- Support automatically scaling LR according to GPU number and samples per GPU
81-
- Support Class Aware Sampler that improves performance on OpenImages Dataset
80+
- Support dedicated `MMDetWandbHook` hook
81+
- Support [ConvNeXt](configs/convnext), [DDOD](configs/ddod), [SOLOv2](configs/solov2)
82+
- Support [Mask2Former](configs/mask2former) for instance segmentation
83+
- Rename [config files of Mask2Former](configs/mask2former)
8284

8385
Please refer to [changelog.md](docs/en/changelog.md) for details and release history.
8486

8587
For compatibility changes between different versions of MMDetection, please refer to [compatibility.md](docs/en/compatibility.md).
8688

89+
## Installation
90+
91+
Please refer to [Installation](docs/en/get_started.md/#Installation) for installation instructions.
92+
93+
## Getting Started
94+
95+
Please see [get_started.md](docs/en/get_started.md) for the basic usage of MMDetection. We provide [colab tutorial](demo/MMDet_Tutorial.ipynb) and [instance segmentation colab tutorial](demo/MMDet_InstanceSeg_Tutorial.ipynb), and other tutorials for:
96+
97+
- [with existing dataset](docs/en/1_exist_data_model.md)
98+
- [with new dataset](docs/en/2_new_data_model.md)
99+
- [with existing dataset_new_model](docs/en/3_exist_data_new_model.md)
100+
- [learn about configs](docs/en/tutorials/config.md)
101+
- [customize_datasets](docs/en/tutorials/customize_dataset.md)
102+
- [customize data pipelines](docs/en/tutorials/data_pipeline.md)
103+
- [customize_models](docs/en/tutorials/customize_models.md)
104+
- [customize runtime settings](docs/en/tutorials/customize_runtime.md)
105+
- [customize_losses](docs/en/tutorials/customize_losses.md)
106+
- [finetuning models](docs/en/tutorials/finetune.md)
107+
- [export a model to ONNX](docs/en/tutorials/pytorch2onnx.md)
108+
- [export ONNX to TRT](docs/en/tutorials/onnx2tensorrt.md)
109+
- [weight initialization](docs/en/tutorials/init_cfg.md)
110+
- [how to xxx](docs/en/tutorials/how_to.md)
111+
87112
## Overview of Benchmark and Model Zoo
88113

89114
Results and models are available in the [model zoo](docs/en/model_zoo.md).
@@ -132,6 +157,7 @@ Results and models are available in the [model zoo](docs/en/model_zoo.md).
132157
<li><a href="configs/double_heads">Double-Head R-CNN (CVPR'2020)</a></li>
133158
<li><a href="configs/atss">ATSS (CVPR'2020)</a></li>
134159
<li><a href="configs/nas_fcos">NAS-FCOS (CVPR'2020)</a></li>
160+
<li><a href="configs/centripetalnet">CentripetalNet (CVPR'2020)</a></li>
135161
<li><a href="configs/autoassign">AutoAssign (ArXiv'2020)</a></li>
136162
<li><a href="configs/sabl">Side-Aware Boundary Localization (ECCV'2020)</a></li>
137163
<li><a href="configs/dynamic_rcnn">Dynamic R-CNN (ECCV'2020)</a></li>
@@ -143,7 +169,7 @@ Results and models are available in the [model zoo](docs/en/model_zoo.md).
143169
<li><a href="configs/yolox">YOLOX (CVPR'2021)</a></li>
144170
<li><a href="configs/deformable_detr">Deformable DETR (ICLR'2021)</a></li>
145171
<li><a href="configs/tood">TOOD (ICCV'2021)</a></li>
146-
<li><a href="configs/centripetalnet">CentripetalNet (CVPR'2020)</a></li>
172+
<li><a href="configs/ddod">DDOD (ACM MM'2021)</a></li>
147173
</ul>
148174
</td>
149175
<td>
@@ -157,8 +183,10 @@ Results and models are available in the [model zoo](docs/en/model_zoo.md).
157183
<li><a href="configs/solo">SOLO (ECCV'2020)</a></li>
158184
<li><a href="configs/point_rend">PointRend (CVPR'2020)</a></li>
159185
<li><a href="configs/detectors">DetectoRS (ArXiv'2020)</a></li>
186+
<li><a href="configs/solov2">SOLOv2 (NeurIPS'2020)</a></li>
160187
<li><a href="configs/scnet">SCNet (AAAI'2021)</a></li>
161188
<li><a href="configs/queryinst">QueryInst (ICCV'2021)</a></li>
189+
<li><a href="configs/mask2former">Mask2Former (ArXiv'2021)</a></li>
162190
</ul>
163191
</td>
164192
<td>
@@ -231,6 +259,7 @@ Results and models are available in the [model zoo](docs/en/model_zoo.md).
231259
<li><a href="configs/pvt">PVTv2 (ArXiv'2021)</a></li>
232260
<li><a href="configs/resnet_strikes_back">ResNet strikes back (ArXiv'2021)</a></li>
233261
<li><a href="configs/efficientnet">EfficientNet (ArXiv'2021)</a></li>
262+
<li><a href="configs/convnext">ConvNeXt (CVPR'2022)</a></li>
234263
</ul>
235264
</td>
236265
<td>
@@ -270,15 +299,7 @@ Results and models are available in the [model zoo](docs/en/model_zoo.md).
270299

271300
Some other methods are also supported in [projects using MMDetection](./docs/en/projects.md).
272301

273-
## Installation
274-
275-
Please refer to [get_started.md](docs/en/get_started.md) for installation.
276-
277-
## Getting Started
278-
279-
Please see [get_started.md](docs/en/get_started.md) for the basic usage of MMDetection.
280-
We provide [detection colab tutorial](demo/MMDet_Tutorial.ipynb) and [instance segmentation colab tutorial](demo/MMDet_InstanceSeg_Tutorial.ipynb), and full guidance for quick run [with existing dataset](docs/en/1_exist_data_model.md) and [with new dataset](docs/en/2_new_data_model.md) for beginners.
281-
There are also tutorials for [finetuning models](docs/en/tutorials/finetune.md), [adding new dataset](docs/en/tutorials/customize_dataset.md), [designing data pipeline](docs/en/tutorials/data_pipeline.md), [customizing models](docs/en/tutorials/customize_models.md), [customizing runtime settings](docs/en/tutorials/customize_runtime.md) and [useful tools](docs/en/useful_tools.md).
302+
## FAQ
282303

283304
Please refer to [FAQ](docs/en/faq.md) for frequently asked questions.
284305

@@ -309,6 +330,10 @@ If you use this toolbox or benchmark in your research, please cite this project.
309330
}
310331
```
311332

333+
## License
334+
335+
This project is released under the [Apache 2.0 license](LICENSE).
336+
312337
## Projects in OpenMMLab
313338

314339
- [MMCV](https://github.com/open-mmlab/mmcv): OpenMMLab foundational library for computer vision.

0 commit comments

Comments
 (0)