Skip to content

Commit a35e1c4

Browse files
committed
Merge branch 'dev-1.x' of github.com:open-mmlab/mmsegmentation into 1.x
2 parents 1c836be + 7ac0888 commit a35e1c4

Some content is hidden

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

54 files changed

+321
-353
lines changed

.circleci/test.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ jobs:
6161
command: |
6262
pip install git+https://github.com/open-mmlab/mmengine.git@main
6363
pip install -U openmim
64-
mim install 'mmcv==2.0.0rc3'
64+
mim install 'mmcv>=2.0.0rc4'
6565
pip install git+https://github.com/open-mmlab/[email protected]
66-
mim install 'mmdet==3.0.0rc5'
66+
pip install git+https://github.com/open-mmlab/[email protected]
6767
pip install -r requirements/tests.txt -r requirements/optional.txt
6868
- run:
6969
name: Build and install
@@ -97,6 +97,7 @@ jobs:
9797
command: |
9898
git clone -b main --depth 1 https://github.com/open-mmlab/mmengine.git /home/circleci/mmengine
9999
git clone -b dev-1.x --depth 1 https://github.com/open-mmlab/mmclassification.git /home/circleci/mmclassification
100+
git clone -b dev-3.x --depth 1 https://github.com/open-mmlab/mmdetection.git /home/circleci/mmdetection
100101
- run:
101102
name: Build Docker image
102103
command: |
@@ -107,9 +108,9 @@ jobs:
107108
command: |
108109
docker exec mmseg pip install -e /mmengine
109110
docker exec mmseg pip install -U openmim
110-
docker exec mmseg mim install 'mmcv==2.0.0rc3'
111+
docker exec mmseg mim install 'mmcv>=2.0.0rc4'
111112
docker exec mmseg pip install -e /mmclassification
112-
docker exec mmseg mim install 'mmdet==3.0.0rc5'
113+
docker exec mmseg pip install -e /mmdetection
113114
docker exec mmseg pip install -r requirements/tests.txt -r requirements/optional.txt
114115
- run:
115116
name: Build and install

.github/workflows/merge_stage_test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
python -V
4545
pip install -U openmim
4646
pip install git+https://github.com/open-mmlab/mmengine.git
47-
mim install 'mmcv==2.0.0rc3'
47+
mim install 'mmcv>=2.0.0rc4'
4848
pip install git+https://github.com/open-mmlab/[email protected]
49-
mim install 'mmdet==3.0.0rc5'
49+
pip install git+https://github.com/open-mmlab/[email protected]
5050
- name: Install unittest dependencies
5151
run: pip install -r requirements/tests.txt -r requirements/optional.txt
5252
- name: Build and install
@@ -100,9 +100,9 @@ jobs:
100100
python -V
101101
pip install -U openmim
102102
pip install git+https://github.com/open-mmlab/mmengine.git
103-
mim install 'mmcv==2.0.0rc3'
103+
mim install 'mmcv>=2.0.0rc4'
104104
pip install git+https://github.com/open-mmlab/[email protected]
105-
mim install 'mmdet==3.0.0rc5'
105+
pip install git+https://github.com/open-mmlab/[email protected]
106106
- name: Install unittest dependencies
107107
run: pip install -r requirements/tests.txt -r requirements/optional.txt
108108
- name: Build and install
@@ -166,9 +166,9 @@ jobs:
166166
python -V
167167
pip install -U openmim
168168
pip install git+https://github.com/open-mmlab/mmengine.git
169-
mim install 'mmcv==2.0.0rc3'
169+
mim install 'mmcv>=2.0.0rc4'
170170
pip install git+https://github.com/open-mmlab/[email protected]
171-
mim install 'mmdet==3.0.0rc5'
171+
pip install git+https://github.com/open-mmlab/[email protected]
172172
- name: Install unittest dependencies
173173
run: pip install -r requirements/tests.txt -r requirements/optional.txt
174174
- name: Build and install
@@ -209,9 +209,9 @@ jobs:
209209
python -V
210210
pip install -U openmim
211211
pip install git+https://github.com/open-mmlab/mmengine.git
212-
mim install 'mmcv==2.0.0rc3'
212+
mim install 'mmcv>=2.0.0rc4'
213213
pip install git+https://github.com/open-mmlab/[email protected]
214-
mim install 'mmdet==3.0.0rc5'
214+
pip install git+https://github.com/open-mmlab/[email protected]
215215
- name: Install unittest dependencies
216216
run: pip install -r requirements/tests.txt -r requirements/optional.txt
217217
- name: Build and install
@@ -244,9 +244,9 @@ jobs:
244244
python -V
245245
pip install -U openmim
246246
pip install git+https://github.com/open-mmlab/mmengine.git
247-
mim install 'mmcv==2.0.0rc3'
247+
mim install 'mmcv>=2.0.0rc4'
248248
pip install git+https://github.com/open-mmlab/[email protected]
249-
mim install 'mmdet==3.0.0rc5'
249+
pip install git+https://github.com/open-mmlab/[email protected]
250250
- name: Install unittest dependencies
251251
run: pip install -r requirements/tests.txt -r requirements/optional.txt
252252
- name: Build and install

.github/workflows/pr_stage_test.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
run: |
4545
pip install -U openmim
4646
pip install git+https://github.com/open-mmlab/mmengine.git
47-
mim install 'mmcv==2.0.0rc3'
47+
mim install 'mmcv>=2.0.0rc4'
4848
pip install git+https://github.com/open-mmlab/[email protected]
49-
mim install 'mmdet==3.0.0rc5'
49+
pip install git+https://github.com/open-mmlab/[email protected]
5050
- name: Install unittest dependencies
5151
run: pip install -r requirements/tests.txt -r requirements/optional.txt
5252
- name: Build and install
@@ -100,9 +100,9 @@ jobs:
100100
python -V
101101
pip install -U openmim
102102
pip install git+https://github.com/open-mmlab/mmengine.git
103-
mim install 'mmcv==2.0.0rc3'
103+
mim install 'mmcv>=2.0.0rc4'
104104
pip install git+https://github.com/open-mmlab/[email protected]
105-
mim install 'mmdet==3.0.0rc5'
105+
pip install git+https://github.com/open-mmlab/[email protected]
106106
- name: Install unittest dependencies
107107
run: pip install -r requirements/tests.txt -r requirements/optional.txt
108108
- name: Build and install
@@ -135,9 +135,9 @@ jobs:
135135
python -V
136136
pip install -U openmim
137137
pip install git+https://github.com/open-mmlab/mmengine.git
138-
mim install 'mmcv==2.0.0rc3'
138+
mim install 'mmcv>=2.0.0rc4'
139139
pip install git+https://github.com/open-mmlab/[email protected]
140-
mim install 'mmdet==3.0.0rc5'
140+
pip install git+https://github.com/open-mmlab/[email protected]
141141
- name: Install unittest dependencies
142142
run: pip install -r requirements/tests.txt -r requirements/optional.txt
143143
- name: Build and install

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The 1.x branch works with **PyTorch 1.6+**.
6262

6363
## What's New
6464

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

6868
- Support ISNet (ICCV'2021) in projects ([#2400](https://github.com/open-mmlab/mmsegmentation/pull/2400))

README_zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ MMSegmentation 是一个基于 PyTorch 的语义分割开源工具箱。它是 O
6161

6262
## 更新日志
6363

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

6767
## 安装

configs/_base_/datasets/ade20k.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
]
2626
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
2727
tta_pipeline = [
28-
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
28+
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
2929
dict(
3030
type='TestTimeAug',
3131
transforms=[

configs/_base_/datasets/ade20k_640x640.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
]
2626
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
2727
tta_pipeline = [
28-
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
28+
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
2929
dict(
3030
type='TestTimeAug',
3131
transforms=[

configs/_base_/datasets/chase_db1.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
]
2727
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
2828
tta_pipeline = [
29-
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
29+
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
3030
dict(
3131
type='TestTimeAug',
3232
transforms=[

configs/_base_/datasets/cityscapes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
]
2626
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
2727
tta_pipeline = [
28-
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
28+
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
2929
dict(
3030
type='TestTimeAug',
3131
transforms=[

configs/_base_/datasets/coco-stuff10k.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
]
2626
img_ratios = [0.5, 0.75, 1.0, 1.25, 1.5, 1.75]
2727
tta_pipeline = [
28-
dict(type='LoadImageFromFile', file_client_args=dict(backend='disk')),
28+
dict(type='LoadImageFromFile', backend_args=dict(backend='local')),
2929
dict(
3030
type='TestTimeAug',
3131
transforms=[

0 commit comments

Comments
 (0)