Skip to content

Commit

Permalink
Merge branch 'dev-1.x' of github.com:open-mmlab/mmsegmentation into 1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
MeowZheng committed Feb 1, 2023
2 parents 1c836be + 7ac0888 commit a35e1c4
Show file tree
Hide file tree
Showing 54 changed files with 321 additions and 353 deletions.
9 changes: 5 additions & 4 deletions .circleci/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ jobs:
command: |
pip install git+https://github.com/open-mmlab/mmengine.git@main
pip install -U openmim
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
pip install -r requirements/tests.txt -r requirements/optional.txt
- run:
name: Build and install
Expand Down Expand Up @@ -97,6 +97,7 @@ jobs:
command: |
git clone -b main --depth 1 https://github.com/open-mmlab/mmengine.git /home/circleci/mmengine
git clone -b dev-1.x --depth 1 https://github.com/open-mmlab/mmclassification.git /home/circleci/mmclassification
git clone -b dev-3.x --depth 1 https://github.com/open-mmlab/mmdetection.git /home/circleci/mmdetection
- run:
name: Build Docker image
command: |
Expand All @@ -107,9 +108,9 @@ jobs:
command: |
docker exec mmseg pip install -e /mmengine
docker exec mmseg pip install -U openmim
docker exec mmseg mim install 'mmcv==2.0.0rc3'
docker exec mmseg mim install 'mmcv>=2.0.0rc4'
docker exec mmseg pip install -e /mmclassification
docker exec mmseg mim install 'mmdet==3.0.0rc5'
docker exec mmseg pip install -e /mmdetection
docker exec mmseg pip install -r requirements/tests.txt -r requirements/optional.txt
- run:
name: Build and install
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/merge_stage_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ jobs:
python -V
pip install -U openmim
pip install git+https://github.com/open-mmlab/mmengine.git
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
- name: Install unittest dependencies
run: pip install -r requirements/tests.txt -r requirements/optional.txt
- name: Build and install
Expand Down Expand Up @@ -100,9 +100,9 @@ jobs:
python -V
pip install -U openmim
pip install git+https://github.com/open-mmlab/mmengine.git
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
- name: Install unittest dependencies
run: pip install -r requirements/tests.txt -r requirements/optional.txt
- name: Build and install
Expand Down Expand Up @@ -166,9 +166,9 @@ jobs:
python -V
pip install -U openmim
pip install git+https://github.com/open-mmlab/mmengine.git
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
- name: Install unittest dependencies
run: pip install -r requirements/tests.txt -r requirements/optional.txt
- name: Build and install
Expand Down Expand Up @@ -209,9 +209,9 @@ jobs:
python -V
pip install -U openmim
pip install git+https://github.com/open-mmlab/mmengine.git
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
- name: Install unittest dependencies
run: pip install -r requirements/tests.txt -r requirements/optional.txt
- name: Build and install
Expand Down Expand Up @@ -244,9 +244,9 @@ jobs:
python -V
pip install -U openmim
pip install git+https://github.com/open-mmlab/mmengine.git
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
- name: Install unittest dependencies
run: pip install -r requirements/tests.txt -r requirements/optional.txt
- name: Build and install
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pr_stage_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ jobs:
run: |
pip install -U openmim
pip install git+https://github.com/open-mmlab/mmengine.git
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
- name: Install unittest dependencies
run: pip install -r requirements/tests.txt -r requirements/optional.txt
- name: Build and install
Expand Down Expand Up @@ -100,9 +100,9 @@ jobs:
python -V
pip install -U openmim
pip install git+https://github.com/open-mmlab/mmengine.git
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
- name: Install unittest dependencies
run: pip install -r requirements/tests.txt -r requirements/optional.txt
- name: Build and install
Expand Down Expand Up @@ -135,9 +135,9 @@ jobs:
python -V
pip install -U openmim
pip install git+https://github.com/open-mmlab/mmengine.git
mim install 'mmcv==2.0.0rc3'
mim install 'mmcv>=2.0.0rc4'
pip install git+https://github.com/open-mmlab/[email protected]
mim install 'mmdet==3.0.0rc5'
pip install git+https://github.com/open-mmlab/[email protected]
- name: Install unittest dependencies
run: pip install -r requirements/tests.txt -r requirements/optional.txt
- name: Build and install
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ The 1.x branch works with **PyTorch 1.6+**.

## What's New

v1.0.0rc4 was released on 30/01/2023.
v1.0.0rc5 was released on 01/02/2023.
Please refer to [changelog.md](docs/en/notes/changelog.md) for details and release history.

- Support ISNet (ICCV'2021) in projects ([#2400](https://github.com/open-mmlab/mmsegmentation/pull/2400))
Expand Down
2 changes: 1 addition & 1 deletion README_zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ MMSegmentation 是一个基于 PyTorch 的语义分割开源工具箱。它是 O

## 更新日志

最新版本 v1.0.0rc4 在 2023.01.30 发布。
最新版本 v1.0.0rc5 在 2023.02.01 发布。
如果想了解更多版本更新细节和历史信息,请阅读[更新日志](docs/en/notes/changelog.md)

## 安装
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/ade20k.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/ade20k_640x640.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/chase_db1.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/cityscapes.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/coco-stuff10k.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/coco-stuff164k.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/drive.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/hrf.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/isaid.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/loveda.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/pascal_context_59.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/pascal_voc12.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/pascal_voc12_aug.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/potsdam.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/stare.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
2 changes: 1 addition & 1 deletion configs/_base_/datasets/vaihingen.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
]
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
tta_pipeline = [
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
dict(
type='TestTimeAug',
transforms=[
Expand Down
8 changes: 5 additions & 3 deletions configs/erfnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@ Semantic segmentation is a challenging task that addresses most of the perceptio

### Cityscapes

| Method | Backbone | Crop Size | Lr schd | Mem (GB) | Inf time (fps) | mIoU | mIoU(ms+flip) | config | download |
| ------ | -------- | --------- | ------: | -------- | -------------- | ----: | ------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| ERFNet | ERFNet | 512x1024 | 160000 | 6.04 | 15.26 | 71.08 | 72.6 | [config](https://github.com/open-mmlab/mmsegmentation/blob/dev-1.x/configs/erfnet/erfnet_fcn_4xb4-160k_cityscapes-512x1024.py) | [model](https://download.openmmlab.com/mmsegmentation/v0.5/erfnet/erfnet_fcn_4x4_512x1024_160k_cityscapes/erfnet_fcn_4x4_512x1024_160k_cityscapes_20211126_082056-03d333ed.pth) \| [log](https://download.openmmlab.com/mmsegmentation/v0.5/erfnet/erfnet_fcn_4x4_512x1024_160k_cityscapes/erfnet_fcn_4x4_512x1024_160k_cityscapes_20211126_082056.log.json) |
| Method | Backbone | Crop Size | Lr schd | Mem (GB) | Inf time (fps) | mIoU | mIoU(ms+flip) | config | download |
| ------ | -------- | --------- | ------: | -------- | -------------- | ---: | ------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| ERFNet | ERFNet | 512x1024 | 160000 | 6.04 | 15.26 | 72.5 | 74.75 | [config](https://github.com/open-mmlab/mmsegmentation/blob/dev-1.x/configs/erfnet/erfnet_fcn_4xb4-160k_cityscapes-512x1024.py) | [model](https://download.openmmlab.com/mmsegmentation/v0.5/erfnet/erfnet_fcn_4x4_512x1024_160k_cityscapes/erfnet_fcn_4x4_512x1024_160k_cityscapes_20220704_162145-dc90157a.pth) \| [log](https://download.openmmlab.com/mmsegmentation/v0.5/erfnet/erfnet_fcn_4x4_512x1024_160k_cityscapes/erfnet_fcn_4x4_512x1024_160k_cityscapes_20220704_162145.log.json) |

Note:

- The model is trained from scratch.

- Last deconvolution layer in the [original paper](https://github.com/Eromera/erfnet_pytorch/blob/master/train/erfnet.py#L123) is replaced by a naive `FCNHead` decoder head and a bilinear upsampling layer, found more effective and efficient.

- This model performance is sensitive to the seed values used, please refer to the log file for the specific settings of the seed. If you choose a different seed, the results might differ from the table results.
6 changes: 3 additions & 3 deletions configs/erfnet/erfnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Models:
- Task: Semantic Segmentation
Dataset: Cityscapes
Metrics:
mIoU: 71.08
mIoU(ms+flip): 72.6
mIoU: 72.5
mIoU(ms+flip): 74.75
Config: configs/erfnet/erfnet_fcn_4xb4-160k_cityscapes-512x1024.py
Weights: https://download.openmmlab.com/mmsegmentation/v0.5/erfnet/erfnet_fcn_4x4_512x1024_160k_cityscapes/erfnet_fcn_4x4_512x1024_160k_cityscapes_20211126_082056-03d333ed.pth
Weights: https://download.openmmlab.com/mmsegmentation/v0.5/erfnet/erfnet_fcn_4x4_512x1024_160k_cityscapes/erfnet_fcn_4x4_512x1024_160k_cityscapes_20220704_162145-dc90157a.pth
Loading

0 comments on commit a35e1c4

Please sign in to comment.