Skip to content

Commit 5163619

Browse files
LeoXing1996LeoXing1996
authored
Merge pull request #1661 from open-mmlab/dev-1.x
Bump Version to 1.0.0rc6
2 parents e7c0539 + 869f576 commit 5163619

File tree

668 files changed

+13241
-10438
lines changed

Some content is hidden

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

668 files changed

+13241
-10438
lines changed

‎.circleci/config.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ workflows:
2020
# line:
2121
# <regex path-to-test> <parameter-to-set> <value-of-pipeline-parameter>
2222
mapping: |
23-
mmedit/.* lint_only false
24-
requirements/.* lint_only false
25-
tests/.* lint_only false
26-
.circleci/.* lint_only false
27-
tools/.* lint_only true
2823
configs/.* lint_only true
2924
docs/.* lint_only true
3025
.dev_scripts/.* lint_only true
3126
.github/.* lint_only true
3227
demo/.* lint_only true
3328
projects/.* lint_only true
29+
mmedit/.* lint_only false
30+
requirements/.* lint_only false
31+
tests/.* lint_only false
32+
.circleci/.* lint_only false
33+
tools/.* lint_only true
3434
base-revision: dev-1.x
3535
# this is the path of the configuration we should trigger once
3636
# path filtering and pipeline parameter value updates are

‎.circleci/test.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
- run:
6060
name: Install mmediting dependencies
6161
command: |
62-
pip install 'opencv-python!=4.7.0.68'
6362
pip install git+https://github.com/open-mmlab/mmengine.git@main
6463
pip install -U openmim
6564
mim install 'mmcv >= 2.0.0rc1'
@@ -103,7 +102,6 @@ jobs:
103102
- run:
104103
name: Install mmedit dependencies
105104
command: |
106-
docker exec mmedit pip install 'opencv-python!=4.7.0.68'
107105
docker exec mmedit pip install -e /mmengine
108106
docker exec mmedit pip install -U openmim
109107
docker exec mmedit mim install 'mmcv >= 2.0.0rc1'
@@ -144,7 +142,7 @@ workflows:
144142
name: minimum_version_cpu
145143
torch: 1.6.0
146144
torchvision: 0.7.0
147-
python: 3.6.9 # The lowest python 3.6.x version available on CircleCI images
145+
python: 3.7.4
148146
requires:
149147
- lint
150148
- build_cpu:

‎.dev_scripts/test_benchmark.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ def create_test_job_batch(commands, model_info, args, port, script_name):
163163
f'#SBATCH --ntasks=2\n'
164164
f'#SBATCH --cpus-per-task=16\n\n'
165165
f'export MASTER_PORT={port}\n'
166+
f'export CUBLAS_WORKSPACE_CONFIG=:4096:8\n'
166167
f'{runner} -u {script_name} {config} {checkpoint} '
167168
f'--work-dir={work_dir} '
168169
f'--out={result_file} '

‎.dev_scripts/test_benchmark.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
cases:
2+
- name: basicvsr-pp_c64n7_8xb1-600k_reds4
3+
params:
4+
checkpoint: basicvsr_plusplus_c64n7_8x1_600k_reds4_20210217-db622b2f.pth
5+
checkpoint_url: https://download.openmmlab.com/mmediting/restorers/basicvsr_plusplus/basicvsr_plusplus_c64n7_8x1_600k_reds4_20210217-db622b2f.pth
6+
config: configs/basicvsr_pp/basicvsr-pp_c64n7_8xb1-600k_reds4.py
7+
cpus_per_node: 16
8+
gpus: 4
9+
gpus_per_node: 4
10+
results:
11+
dataset: REDS4(BIx4)
12+
eval:
13+
- PSNR
14+
- SSIM
15+
metrics:
16+
PSNR (RGB): 32.3855
17+
SSIM (RGB): 0.9069
18+
19+
- name: realbasicvsr_c64b20_1x30x8_lr5e-5_150k_reds
20+
params:
21+
checkpoint: realbasicvsr_c64b20_1x30x8_lr5e-5_150k_reds_20211104-52f77c2c.pth
22+
checkpoint_url: https://download.openmmlab.com/mmediting/restorers/real_basicvsr/realbasicvsr_c64b20_1x30x8_lr5e-5_150k_reds_20211104-52f77c2c.pth
23+
config: configs/real_basicvsr/realbasicvsr_c64b20-1x30x8_8xb1-lr5e-5-150k_reds.py
24+
cpus_per_node: 16
25+
gpus: 8
26+
gpus_per_node: 8
27+
results:
28+
dataset: REDS
29+
eval:
30+
- NIQE
31+
metrics:
32+
NIQE (Y): 3.7662
33+
34+
- name: stylegan2_c2_8xb4-800kiters_ffhq-256x256
35+
params:
36+
checkpoint: stylegan2_c2_ffhq_256_b4x8_20210407_160709-7890ae1f.pth
37+
checkpoint_url: https://download.openmmlab.com/mmediting/stylegan2/stylegan2_c2_ffhq_256_b4x8_20210407_160709-7890ae1f.pth
38+
config: configs/styleganv2/stylegan2_c2-PL_8xb4-fp16-partial-GD-no-scaler-800kiters_ffhq-256x256.py
39+
cpus_per_node: 4
40+
gpus: 8
41+
gpus_per_node: 8
42+
results:
43+
dataset: FFHQ256
44+
metrics:
45+
FID-50k: 3.992
46+
47+
- name: deepfillv1_256x256_8x2_places
48+
params:
49+
checkpoint: deepfillv1_256x256_8x2_places_20200619-c00a0e21.pth
50+
checkpoint_url: https://download.openmmlab.com/mmediting/inpainting/deepfillv1/deepfillv1_256x256_8x2_places_20200619-c00a0e21.pth
51+
config: configs/deepfillv1/deepfillv1_4xb4_celeba-256x256.py
52+
cpus_per_node: 16
53+
gpus: 8
54+
gpus_per_node: 8
55+
results:
56+
dataset: Places365-val
57+
metrics:
58+
PSNR: 23.429
59+
SSIM: 0.862
60+
l1 error: 11.019
61+
62+
- name: realesrnet_c64b23g32_12x4_lr2e-4_1000k_df2k_ost
63+
params:
64+
checkpoint: realesrnet_c64b23g32_12x4_lr2e-4_1000k_df2k_ost_20210816-4ae3b5a4.pth
65+
checkpoint_url: https://download.openmmlab.com/mmediting/restorers/real_esrgan/realesrnet_c64b23g32_12x4_lr2e-4_1000k_df2k_ost_20210816-4ae3b5a4.pth
66+
config: configs/real_esrgan/realesrnet_c64b23g32_4xb12-lr2e-4-1000k_df2k-ost.py
67+
cpus_per_node: 16
68+
gpus: 8
69+
gpus_per_node: 8
70+
results:
71+
dataset: df2k_ost
72+
metrics:
73+
PSNR: 28.0297
74+
SSIM: 0.8236
75+
76+
cluster_num: '2'
77+
default_floating_range: 1.0
78+
model_floating_ranges: {}
79+
partition: mm_lol
80+
repo: mmediting
81+
branch: dev-1.x
82+
task_type: test
83+
third_part_libs: []

‎.dev_scripts/train_benchmark.yml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
cases:
2+
- name: basicvsr-pp_c64n7_8xb1-600k_reds4
3+
params:
4+
checkpoint: basicvsr_plusplus_c64n7_8x1_600k_reds4_20210217-db622b2f.pth
5+
checkpoint_url: https://download.openmmlab.com/mmediting/restorers/basicvsr_plusplus/basicvsr_plusplus_c64n7_8x1_600k_reds4_20210217-db622b2f.pth
6+
config: configs/basicvsr_pp/basicvsr-pp_c64n7_8xb1-600k_reds4.py
7+
cpus_per_node: 16
8+
gpus: 4
9+
gpus_per_node: 4
10+
results:
11+
dataset: REDS4(BIx4)
12+
eval:
13+
- PSNR
14+
- SSIM
15+
metrics:
16+
PSNR (RGB): 32.3855
17+
SSIM (RGB): 0.9069
18+
19+
- name: realbasicvsr_c64b20_1x30x8_lr5e-5_150k_reds
20+
params:
21+
checkpoint: realbasicvsr_c64b20_1x30x8_lr5e-5_150k_reds_20211104-52f77c2c.pth
22+
checkpoint_url: https://download.openmmlab.com/mmediting/restorers/real_basicvsr/realbasicvsr_c64b20_1x30x8_lr5e-5_150k_reds_20211104-52f77c2c.pth
23+
config: configs/real_basicvsr/realbasicvsr_c64b20-1x30x8_8xb1-lr5e-5-150k_reds.py
24+
cpus_per_node: 16
25+
gpus: 8
26+
gpus_per_node: 8
27+
results:
28+
dataset: REDS
29+
eval:
30+
- NIQE
31+
metrics:
32+
NIQE (Y): 3.7662
33+
34+
- name: stylegan2_c2_8xb4-800kiters_ffhq-256x256
35+
params:
36+
checkpoint: stylegan2_c2_ffhq_256_b4x8_20210407_160709-7890ae1f.pth
37+
checkpoint_url: https://download.openmmlab.com/mmediting/stylegan2/stylegan2_c2_ffhq_256_b4x8_20210407_160709-7890ae1f.pth
38+
config: configs/styleganv2/stylegan2_c2-PL_8xb4-fp16-partial-GD-no-scaler-800kiters_ffhq-256x256.py
39+
cpus_per_node: 4
40+
gpus: 8
41+
gpus_per_node: 8
42+
results:
43+
dataset: FFHQ256
44+
metrics:
45+
FID-50k: 3.992
46+
47+
- name: deepfillv1_256x256_8x2_places
48+
params:
49+
checkpoint: deepfillv1_256x256_8x2_places_20200619-c00a0e21.pth
50+
checkpoint_url: https://download.openmmlab.com/mmediting/inpainting/deepfillv1/deepfillv1_256x256_8x2_places_20200619-c00a0e21.pth
51+
config: configs/deepfillv1/deepfillv1_4xb4_celeba-256x256.py
52+
cpus_per_node: 16
53+
gpus: 8
54+
gpus_per_node: 8
55+
results:
56+
dataset: Places365-val
57+
metrics:
58+
PSNR: 23.429
59+
SSIM: 0.862
60+
l1 error: 11.019
61+
62+
- name: realesrnet_c64b23g32_12x4_lr2e-4_1000k_df2k_ost
63+
params:
64+
checkpoint: realesrnet_c64b23g32_12x4_lr2e-4_1000k_df2k_ost_20210816-4ae3b5a4.pth
65+
checkpoint_url: https://download.openmmlab.com/mmediting/restorers/real_esrgan/realesrnet_c64b23g32_12x4_lr2e-4_1000k_df2k_ost_20210816-4ae3b5a4.pth
66+
config: configs/real_esrgan/realesrnet_c64b23g32_4xb12-lr2e-4-1000k_df2k-ost.py
67+
cpus_per_node: 16
68+
gpus: 8
69+
gpus_per_node: 8
70+
results:
71+
dataset: df2k_ost
72+
metrics:
73+
PSNR: 28.0297
74+
SSIM: 0.8236
75+
76+
cluster_num: '2'
77+
default_floating_range: 1.0
78+
model_floating_ranges: {}
79+
partition: mm_lol
80+
repo: mmediting
81+
branch: dev-1.x
82+
task_type: train
83+
third_part_libs: []

0 commit comments

Comments
 (0)