Skip to content

Commit b600f7c

Browse files
xiexinchxiexinch
committed
Merge branch 'dev-1.x' of github.com:open-mmlab/mmsegmentation into main
2 parents 0601f28 + 892f9e1 commit b600f7c

File tree

23 files changed

+305
-298
lines changed

23 files changed

+305
-298
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ workflows:
2626
tools/.* lint_only false
2727
configs/.* lint_only false
2828
.circleci/.* lint_only false
29-
base-revision: dev-1.x
29+
base-revision: main
3030
# this is the path of the configuration we should trigger once
3131
# path filtering and pipeline parameter value updates are
3232
# complete. In this case, we are using the parent dynamic

‎.circleci/test.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ jobs:
6262
pip install git+https://github.com/open-mmlab/mmengine.git@main
6363
pip install -U openmim
6464
mim install 'mmcv>=2.0.0rc4'
65-
pip install git+https://github.com/open-mmlab/[email protected]
66-
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
65+
pip install mmcls==1.0.0rc6
66+
pip install git+https://github.com/open-mmlab/mmdetection.git@main
6767
pip install -r requirements/tests.txt -r requirements/optional.txt
6868
- run:
6969
name: Build and install
@@ -96,7 +96,6 @@ jobs:
9696
name: Clone Repos
9797
command: |
9898
git clone -b main --depth 1 https://github.com/open-mmlab/mmengine.git /home/circleci/mmengine
99-
git clone -b dev-1.x --depth 1 https://github.com/open-mmlab/mmclassification.git /home/circleci/mmclassification
10099
git clone -b dev-3.x --depth 1 https://github.com/open-mmlab/mmdetection.git /home/circleci/mmdetection
101100
- run:
102101
name: Build Docker image
@@ -109,7 +108,7 @@ jobs:
109108
docker exec mmseg pip install -e /mmengine
110109
docker exec mmseg pip install -U openmim
111110
docker exec mmseg mim install 'mmcv>=2.0.0rc4'
112-
docker exec mmseg pip install -e /mmclassification
111+
docker exec mmseg pip install mmcls==1.0.0rc6
113112
docker exec mmseg pip install -e /mmdetection
114113
docker exec mmseg pip install -r requirements/tests.txt -r requirements/optional.txt
115114
- run:
@@ -130,8 +129,7 @@ workflows:
130129
branches:
131130
ignore:
132131
- dev-1.x
133-
- 1.x
134-
- master
132+
- main
135133
pr_stage_test:
136134
when:
137135
not:
@@ -143,8 +141,7 @@ workflows:
143141
branches:
144142
ignore:
145143
- dev-1.x
146-
- 1.x
147-
- master
144+
- main
148145
- build_cpu:
149146
name: minimum_version_cpu
150147
torch: 1.6.0
@@ -187,4 +184,4 @@ workflows:
187184
branches:
188185
only:
189186
- dev-1.x
190-
- 1.x
187+
- main

‎.github/workflows/deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ concurrency:
88

99
jobs:
1010
build-n-publish:
11-
runs-on: ubuntu-latest
11+
runs-on: ubuntu-22.04
1212
if: startsWith(github.event.ref, 'refs/tags')
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
- name: Set up Python 3.7
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v4
1717
with:
1818
python-version: 3.7
1919
- name: Build MMSegmentation

‎.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ concurrency:
88

99
jobs:
1010
lint:
11-
runs-on: ubuntu-18.04
11+
runs-on: ubuntu-22.04
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- name: Set up Python 3.7
15-
uses: actions/setup-python@v2
15+
uses: actions/setup-python@v4
1616
with:
1717
python-version: 3.7
1818
- name: Install pre-commit hook

‎.github/workflows/merge_stage_test.yml

Lines changed: 14 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
jobs:
2121
build_cpu_py:
22-
runs-on: ubuntu-18.04
22+
runs-on: ubuntu-22.04
2323
strategy:
2424
matrix:
2525
python-version: [3.8, 3.9]
@@ -28,9 +28,9 @@ jobs:
2828
- torch: 1.8.1
2929
torchvision: 0.9.1
3030
steps:
31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v3
3232
- name: Set up Python ${{ matrix.python-version }}
33-
uses: actions/setup-python@v2
33+
uses: actions/setup-python@v4
3434
with:
3535
python-version: ${{ matrix.python-version }}
3636
- name: Upgrade pip
@@ -45,8 +45,8 @@ jobs:
4545
pip install -U openmim
4646
pip install git+https://github.com/open-mmlab/mmengine.git
4747
mim install 'mmcv>=2.0.0rc4'
48-
pip install git+https://github.com/open-mmlab/[email protected]
49-
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
48+
pip install mmcls==1.0.0rc6
49+
pip install git+https://github.com/open-mmlab/mmdetection.git@main
5050
- name: Install unittest dependencies
5151
run: pip install -r requirements/tests.txt -r requirements/optional.txt
5252
- name: Build and install
@@ -58,7 +58,7 @@ jobs:
5858
coverage xml
5959
coverage report -m
6060
build_cpu_pt:
61-
runs-on: ubuntu-18.04
61+
runs-on: ubuntu-22.04
6262
strategy:
6363
matrix:
6464
python-version: [3.7]
@@ -82,9 +82,9 @@ jobs:
8282
# - torch: 1.13.0
8383
# torchvision: 0.14.0
8484
steps:
85-
- uses: actions/checkout@v2
85+
- uses: actions/checkout@v3
8686
- name: Set up Python ${{ matrix.python-version }}
87-
uses: actions/setup-python@v2
87+
uses: actions/setup-python@v4
8888
with:
8989
python-version: ${{ matrix.python-version }}
9090
- name: Upgrade pip
@@ -101,8 +101,8 @@ jobs:
101101
pip install -U openmim
102102
pip install git+https://github.com/open-mmlab/mmengine.git
103103
mim install 'mmcv>=2.0.0rc4'
104-
pip install git+https://github.com/open-mmlab/[email protected]
105-
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
104+
pip install mmcls==1.0.0rc6
105+
pip install git+https://github.com/open-mmlab/mmdetection.git@main
106106
- name: Install unittest dependencies
107107
run: pip install -r requirements/tests.txt -r requirements/optional.txt
108108
- name: Build and install
@@ -131,93 +131,6 @@ jobs:
131131
env_vars: OS,PYTHON
132132
name: codecov-umbrella
133133
fail_ci_if_error: false
134-
135-
build_cu102:
136-
runs-on: ubuntu-18.04
137-
container:
138-
image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
139-
strategy:
140-
matrix:
141-
python-version: [3.7]
142-
include:
143-
- torch: 1.8.1
144-
cuda: 10.2
145-
steps:
146-
- uses: actions/checkout@v2
147-
- name: Set up Python ${{ matrix.python-version }}
148-
uses: actions/setup-python@v2
149-
with:
150-
python-version: ${{ matrix.python-version }}
151-
- name: Upgrade pip
152-
run: |
153-
pip install pip --upgrade
154-
pip install wheel
155-
- name: Fetch GPG keys
156-
run: |
157-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
158-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
159-
- name: Install Python-dev
160-
run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
161-
- name: Install system dependencies
162-
run: |
163-
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6
164-
- name: Install mmseg dependencies
165-
run: |
166-
python -V
167-
pip install -U openmim
168-
pip install git+https://github.com/open-mmlab/mmengine.git
169-
mim install 'mmcv>=2.0.0rc4'
170-
pip install git+https://github.com/open-mmlab/[email protected]
171-
pip install git+https://github.com/open-mmlab/[email protected]
172-
- name: Install unittest dependencies
173-
run: pip install -r requirements/tests.txt -r requirements/optional.txt
174-
- name: Build and install
175-
run: |
176-
python setup.py check -m -s
177-
TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
178-
build_cu116:
179-
runs-on: ubuntu-18.04
180-
container:
181-
image: pytorch/pytorch:1.13.0-cuda11.6-cudnn8-devel
182-
strategy:
183-
matrix:
184-
python-version: [3.7]
185-
include:
186-
- torch: 1.13.0
187-
cuda: 11.6
188-
steps:
189-
- uses: actions/checkout@v2
190-
- name: Set up Python ${{ matrix.python-version }}
191-
uses: actions/setup-python@v2
192-
with:
193-
python-version: ${{ matrix.python-version }}
194-
- name: Upgrade pip
195-
run: |
196-
pip install pip --upgrade
197-
pip install wheel
198-
- name: Fetch GPG keys
199-
run: |
200-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
201-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
202-
- name: Install Python-dev
203-
run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
204-
- name: Install system dependencies
205-
run: |
206-
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6
207-
- name: Install mmseg dependencies
208-
run: |
209-
python -V
210-
pip install -U openmim
211-
pip install git+https://github.com/open-mmlab/mmengine.git
212-
mim install 'mmcv>=2.0.0rc4'
213-
pip install git+https://github.com/open-mmlab/[email protected]
214-
pip install git+https://github.com/open-mmlab/[email protected]
215-
- name: Install unittest dependencies
216-
run: pip install -r requirements/tests.txt -r requirements/optional.txt
217-
- name: Build and install
218-
run: |
219-
python setup.py check -m -s
220-
TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
221134
build_windows:
222135
runs-on: ${{ matrix.os }}
223136
strategy:
@@ -226,9 +139,9 @@ jobs:
226139
python: [3.7]
227140
platform: [cpu, cu111]
228141
steps:
229-
- uses: actions/checkout@v2
142+
- uses: actions/checkout@v3
230143
- name: Set up Python ${{ matrix.python-version }}
231-
uses: actions/setup-python@v2
144+
uses: actions/setup-python@v4
232145
with:
233146
python-version: ${{ matrix.python-version }}
234147
- name: Upgrade pip
@@ -245,8 +158,8 @@ jobs:
245158
pip install -U openmim
246159
pip install git+https://github.com/open-mmlab/mmengine.git
247160
mim install 'mmcv>=2.0.0rc4'
248-
pip install git+https://github.com/open-mmlab/[email protected]
249-
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
161+
pip install mmcls==1.0.0rc6
162+
pip install git+https://github.com/open-mmlab/mmdetection.git@main
250163
- name: Install unittest dependencies
251164
run: pip install -r requirements/tests.txt -r requirements/optional.txt
252165
- name: Build and install

‎.github/workflows/pr_stage_test.yml

Lines changed: 9 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ concurrency:
1717

1818
jobs:
1919
build_cpu:
20-
runs-on: ubuntu-18.04
20+
runs-on: ubuntu-22.04
2121
strategy:
2222
matrix:
2323
python-version: [3.7]
2424
include:
2525
- torch: 1.8.1
2626
torchvision: 0.9.1
2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2929
- name: Set up Python ${{ matrix.python-version }}
30-
uses: actions/setup-python@v2
30+
uses: actions/setup-python@v4
3131
with:
3232
python-version: ${{ matrix.python-version }}
3333
- name: Upgrade pip
@@ -45,8 +45,8 @@ jobs:
4545
pip install -U openmim
4646
pip install git+https://github.com/open-mmlab/mmengine.git
4747
mim install 'mmcv>=2.0.0rc4'
48-
pip install git+https://github.com/open-mmlab/[email protected]
49-
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
48+
pip install mmcls==1.0.0rc6
49+
pip install git+https://github.com/open-mmlab/mmdetection.git@main
5050
- name: Install unittest dependencies
5151
run: pip install -r requirements/tests.txt -r requirements/optional.txt
5252
- name: Build and install
@@ -66,49 +66,6 @@ jobs:
6666
env_vars: OS,PYTHON
6767
name: codecov-umbrella
6868
fail_ci_if_error: false
69-
70-
build_cu102:
71-
runs-on: ubuntu-18.04
72-
container:
73-
image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
74-
strategy:
75-
matrix:
76-
python-version: [3.7]
77-
steps:
78-
- uses: actions/checkout@v2
79-
- name: Set up Python ${{ matrix.python-version }}
80-
uses: actions/setup-python@v2
81-
with:
82-
python-version: ${{ matrix.python-version }}
83-
- name: Upgrade pip
84-
run: |
85-
pip install pip --upgrade
86-
pip install wheel
87-
- name: Fetch GPG keys
88-
run: |
89-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
90-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
91-
- name: Install Python-dev
92-
run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
93-
if: ${{matrix.python-version != 3.9}}
94-
- name: Install system dependencies
95-
run: |
96-
apt-get update
97-
apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev
98-
- name: Install mmseg dependencies
99-
run: |
100-
python -V
101-
pip install -U openmim
102-
pip install git+https://github.com/open-mmlab/mmengine.git
103-
mim install 'mmcv>=2.0.0rc4'
104-
pip install git+https://github.com/open-mmlab/[email protected]
105-
pip install git+https://github.com/open-mmlab/[email protected]
106-
- name: Install unittest dependencies
107-
run: pip install -r requirements/tests.txt -r requirements/optional.txt
108-
- name: Build and install
109-
run: |
110-
python setup.py check -m -s
111-
TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
11269
build_windows:
11370
runs-on: ${{ matrix.os }}
11471
strategy:
@@ -117,9 +74,9 @@ jobs:
11774
python: [3.7]
11875
platform: [cpu, cu111]
11976
steps:
120-
- uses: actions/checkout@v2
77+
- uses: actions/checkout@v3
12178
- name: Set up Python ${{ matrix.python-version }}
122-
uses: actions/setup-python@v2
79+
uses: actions/setup-python@v4
12380
with:
12481
python-version: ${{ matrix.python-version }}
12582
- name: Upgrade pip
@@ -136,8 +93,8 @@ jobs:
13693
pip install -U openmim
13794
pip install git+https://github.com/open-mmlab/mmengine.git
13895
mim install 'mmcv>=2.0.0rc4'
139-
pip install git+https://github.com/open-mmlab/[email protected]
140-
pip install git+https://github.com/open-mmlab/mmdetection.git@dev-3.x
96+
pip install mmcls==1.0.0rc6
97+
pip install git+https://github.com/open-mmlab/mmdetection.git@main
14198
- name: Install unittest dependencies
14299
run: pip install -r requirements/tests.txt -r requirements/optional.txt
143100
- name: Build and install

0 commit comments

Comments
 (0)