Skip to content

Commit c4f9eb8

Browse files
Z-FranZ-Fran
authored
Bump Version to 1.0.0rc7
Bump Version to 1.0.0rc7
2 parents 71af274 + 677a13f commit c4f9eb8

File tree

231 files changed

+5585
-5448
lines changed

Some content is hidden

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

231 files changed

+5585
-5448
lines changed

‎.circleci/test.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ 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.0rc1'
64+
mim install 'mmcv >= 2.0.0'
6565
pip install -r requirements/tests.txt
6666
- run:
6767
name: Build and install
@@ -104,7 +104,7 @@ jobs:
104104
command: |
105105
docker exec mmedit pip install -e /mmengine
106106
docker exec mmedit pip install -U openmim
107-
docker exec mmedit mim install 'mmcv >= 2.0.0rc1'
107+
docker exec mmedit mim install 'mmcv >= 2.0.0'
108108
docker exec mmedit pip install -r requirements/tests.txt
109109
- run:
110110
name: Build and install
@@ -125,7 +125,7 @@ workflows:
125125
branches:
126126
ignore:
127127
- dev-1.x
128-
- 1.x
128+
- main
129129
pr_stage_test:
130130
when:
131131
not:
@@ -137,11 +137,11 @@ workflows:
137137
branches:
138138
ignore:
139139
- dev-1.x
140-
- 1.x
140+
- main
141141
- build_cpu:
142142
name: minimum_version_cpu
143-
torch: 1.6.0
144-
torchvision: 0.7.0
143+
torch: 1.8.1
144+
torchvision: 0.9.1
145145
python: 3.7.4
146146
requires:
147147
- lint
@@ -171,10 +171,10 @@ workflows:
171171
jobs:
172172
- build_cuda:
173173
name: minimum_version_gpu
174-
torch: 1.6.0
174+
torch: 1.8.1
175175
# Use double quotation mark to explicitly specify its type
176176
# as string instead of number
177-
cuda: "10.1"
177+
cuda: "10.2"
178178
filters:
179179
branches:
180180
only:

‎.github/workflows/merge_stage_test.yml‎

Lines changed: 32 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
branches:
1515
- dev-1.x
1616
- test-1.x
17-
- 1.x
17+
- main
1818
- test-branch
1919

2020
concurrency:
@@ -23,7 +23,7 @@ concurrency:
2323

2424
jobs:
2525
build_cpu_py:
26-
runs-on: ubuntu-18.04
26+
runs-on: ubuntu-22.04
2727
strategy:
2828
matrix:
2929
python-version: [3.8, 3.9]
@@ -32,21 +32,21 @@ jobs:
3232
- torch: 1.8.1
3333
torchvision: 0.9.1
3434
steps:
35-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v3
3636
- name: Set up Python ${{ matrix.python-version }}
37-
uses: actions/setup-python@v2
37+
uses: actions/setup-python@v4
3838
with:
3939
python-version: ${{ matrix.python-version }}
4040
- name: Upgrade pip
4141
run: pip install pip --upgrade
4242
- name: Install PyTorch
43-
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
43+
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
4444
- name: Install MMEngine
4545
run: pip install git+https://github.com/open-mmlab/mmengine.git@main
4646
- name: Install MMCV
4747
run: |
4848
pip install -U openmim
49-
mim install 'mmcv >= 2.0.0rc1'
49+
mim install 'mmcv >= 2.0.0'
5050
- name: Install other dependencies
5151
run: |
5252
pip install -r requirements/tests.txt
@@ -59,16 +59,12 @@ jobs:
5959
coverage report -m
6060
6161
build_cpu_pt:
62-
runs-on: ubuntu-18.04
62+
runs-on: ubuntu-22.04
6363
strategy:
6464
matrix:
6565
python-version: [3.7]
66-
torch: [1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.1, 1.13.0]
66+
torch: [1.8.1, 1.9.1, 1.10.1, 1.11.0, 1.12.1, 1.13.0]
6767
include:
68-
- torch: 1.6.0
69-
torchvision: 0.7.0
70-
- torch: 1.7.1
71-
torchvision: 0.8.2
7268
- torch: 1.8.1
7369
torchvision: 0.9.1
7470
- torch: 1.9.1
@@ -82,21 +78,21 @@ jobs:
8278
- torch: 1.13.0
8379
torchvision: 0.14.0
8480
steps:
85-
- uses: actions/checkout@v2
81+
- uses: actions/checkout@v3
8682
- name: Set up Python ${{ matrix.python-version }}
87-
uses: actions/setup-python@v2
83+
uses: actions/setup-python@v4
8884
with:
8985
python-version: ${{ matrix.python-version }}
9086
- name: Upgrade pip
9187
run: pip install pip --upgrade
9288
- name: Install PyTorch
93-
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/torch_stable.html
89+
run: pip install torch==${{matrix.torch}}+cpu torchvision==${{matrix.torchvision}}+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html
9490
- name: Install MMEngine
9591
run: pip install git+https://github.com/open-mmlab/mmengine.git@main
9692
- name: Install MMCV
9793
run: |
9894
pip install -U openmim
99-
mim install 'mmcv >= 2.0.0rc1'
95+
mim install 'mmcv >= 2.0.0'
10096
- name: Install other dependencies
10197
run: |
10298
pip install -r requirements/tests.txt
@@ -119,7 +115,7 @@ jobs:
119115
fail_ci_if_error: false
120116

121117
build_cu102:
122-
runs-on: ubuntu-18.04
118+
runs-on: ubuntu-22.04
123119
container:
124120
image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
125121
strategy:
@@ -129,37 +125,33 @@ jobs:
129125
- torch: 1.8.1
130126
cuda: 10.2
131127
steps:
132-
- uses: actions/checkout@v2
128+
- uses: actions/checkout@v3
133129
- name: Set up Python ${{ matrix.python-version }}
134-
uses: actions/setup-python@v2
130+
uses: actions/setup-python@v4
135131
with:
136132
python-version: ${{ matrix.python-version }}
137133
- name: Upgrade pip
138134
run: pip install pip --upgrade
139135
- name: Fetch GPG keys
140136
run: |
141-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
142-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
143-
- name: Install Python-dev
144-
run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
145-
if: ${{matrix.python-version != 3.9}}
137+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
138+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu2204/x86_64/7fa2af80.pub
146139
- name: Install system dependencies
147140
run: |
148141
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6
149142
- name: Install PyTorch
150-
run: python -m pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html
143+
run: pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/lts/1.8/torch_lts.html
151144
- name: Install mmediting dependencies
152145
run: |
153146
pip install -U openmim
154-
mim install 'mmcv >= 2.0.0rc1'
147+
mim install 'mmcv >= 2.0.0'
155148
pip install -r requirements/tests.txt
156149
- name: Build and install
157150
run: |
158-
python setup.py check -m -s
159-
TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
151+
pip install -e .
160152
161153
build_cu116:
162-
runs-on: ubuntu-18.04
154+
runs-on: ubuntu-22.04
163155
container:
164156
image: pytorch/pytorch:1.13.0-cuda11.6-cudnn8-devel
165157
strategy:
@@ -169,52 +161,47 @@ jobs:
169161
- torch: 1.8.1
170162
cuda: 10.2
171163
steps:
172-
- uses: actions/checkout@v2
164+
- uses: actions/checkout@v3
173165
- name: Set up Python ${{ matrix.python-version }}
174-
uses: actions/setup-python@v2
166+
uses: actions/setup-python@v4
175167
with:
176168
python-version: ${{ matrix.python-version }}
177169
- name: Upgrade pip
178170
run: pip install pip --upgrade
179171
- name: Fetch GPG keys
180172
run: |
181-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
182-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
183-
- name: Install Python-dev
184-
run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
185-
if: ${{matrix.python-version != 3.9}}
173+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
174+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu2204/x86_64/7fa2af80.pub
186175
- name: Install system dependencies
187176
run: |
188177
apt-get update && apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libsm6 libxrender-dev libxext6
189178
- name: Install PyTorch
190-
run: python -m pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu
179+
run: pip install torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu
191180
- name: Install mmediting dependencies
192181
run: |
193182
pip install git+https://github.com/open-mmlab/mmengine.git@main
194183
pip install -U openmim
195-
mim install 'mmcv >= 2.0.0rc1'
184+
mim install 'mmcv >= 2.0.0'
196185
pip install -r requirements/tests.txt
197186
- name: Build and install
198187
run: |
199-
python setup.py check -m -s
200-
TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
188+
pip install -e .
201189
- name: Run unittests and generate coverage report
202190
run: |
203191
coverage run --branch --source mmedit -m pytest tests/
204192
coverage xml --omit="**/stylegan3_ops/*,**/conv2d_gradfix.py,**/grid_sample_gradfix.py,**/misc.py,**/upfirdn2d.py,**all_gather_layer.py"
205193
coverage report -m
206194
207195
build_windows:
208-
runs-on: ${{ matrix.os }}
196+
runs-on: windows-2022
209197
strategy:
210198
matrix:
211-
os: [windows-2022]
212199
python: [3.7]
213200
platform: [cpu, cu111]
214201
steps:
215-
- uses: actions/checkout@v2
202+
- uses: actions/checkout@v3
216203
- name: Set up Python ${{ matrix.python-version }}
217-
uses: actions/setup-python@v2
204+
uses: actions/setup-python@v4
218205
with:
219206
python-version: ${{ matrix.python-version }}
220207
- name: Upgrade pip
@@ -227,7 +214,7 @@ jobs:
227214
run: |
228215
python -m pip install git+https://github.com/open-mmlab/mmengine.git@main
229216
python -m pip install -U openmim
230-
mim install 'mmcv >= 2.0.0rc1'
217+
mim install 'mmcv >= 2.0.0'
231218
python -m pip install -r requirements/tests.txt
232219
- name: Build and install
233220
run: |

‎.github/workflows/pr_stage_test.yml‎

Lines changed: 17 additions & 22 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
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install MMCV
4040
run: |
4141
pip install -U openmim
42-
mim install 'mmcv >= 2.0.0rc1'
42+
mim install 'mmcv >= 2.0.0'
4343
- name: Install other dependencies
4444
run: |
4545
pip install -r requirements/tests.txt
@@ -64,58 +64,53 @@ jobs:
6464
# uses: mxschmitt/action-tmate@v3
6565

6666
build_cu102:
67-
runs-on: ubuntu-18.04
67+
runs-on: ubuntu-22.04
6868
container:
6969
image: pytorch/pytorch:1.8.1-cuda10.2-cudnn7-devel
7070
strategy:
7171
matrix:
7272
python-version: [3.7]
7373
steps:
74-
- uses: actions/checkout@v2
74+
- uses: actions/checkout@v3
7575
- name: Set up Python ${{ matrix.python-version }}
76-
uses: actions/setup-python@v2
76+
uses: actions/setup-python@v4
7777
with:
7878
python-version: ${{ matrix.python-version }}
7979
- name: Upgrade pip
8080
run: pip install pip --upgrade
8181
- name: Fetch GPG keys
8282
run: |
83-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub
84-
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub
85-
- name: Install Python-dev
86-
run: apt-get update && apt-get install -y python${{matrix.python-version}}-dev
87-
if: ${{matrix.python-version != 3.9}}
83+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/3bf863cc.pub
84+
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu2204/x86_64/7fa2af80.pub
8885
- name: Install system dependencies
8986
run: |
9087
apt-get update
9188
apt-get install -y ffmpeg libsm6 libxext6 git ninja-build libglib2.0-0 libxrender-dev
9289
- name: Install PyTorch
93-
run: python -m pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
90+
run: pip install torch==1.8.1+cpu torchvision==0.9.1+cpu -f https://download.pytorch.org/whl/torch_stable.html
9491
- name: Install mmedit dependencies
9592
run: |
9693
pip install git+https://github.com/open-mmlab/mmengine.git@main
9794
pip install -U openmim
98-
mim install 'mmcv >= 2.0.0rc1'
95+
mim install 'mmcv >= 2.0.0'
9996
pip install -r requirements/tests.txt
10097
- name: Build and install
10198
run: |
102-
python setup.py check -m -s
103-
TORCH_CUDA_ARCH_LIST=7.0 pip install -e .
99+
pip install -e .
104100
# - name: Setup tmate session
105101
# if: ${{ failure() }}
106102
# uses: mxschmitt/action-tmate@v3
107103

108104
build_windows:
109-
runs-on: ${{ matrix.os }}
105+
runs-on: windows-2022
110106
strategy:
111107
matrix:
112-
os: [windows-2022]
113-
python: [3.7]
108+
python-version: [3.7]
114109
platform: [cpu, cu111]
115110
steps:
116-
- uses: actions/checkout@v2
111+
- uses: actions/checkout@v3
117112
- name: Set up Python ${{ matrix.python-version }}
118-
uses: actions/setup-python@v2
113+
uses: actions/setup-python@v4
119114
with:
120115
python-version: ${{ matrix.python-version }}
121116
- name: Upgrade pip
@@ -128,7 +123,7 @@ jobs:
128123
run: |
129124
python -m pip install git+https://github.com/open-mmlab/mmengine.git@main
130125
python -m pip install -U openmim
131-
mim install 'mmcv >= 2.0.0rc1'
126+
mim install 'mmcv >= 2.0.0'
132127
python -m pip install -r requirements/tests.txt
133128
- name: Build and install
134129
run: |

0 commit comments

Comments
 (0)