Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add more results of OCRNet #20

Merged
merged 64 commits into from
Aug 14, 2020
Merged

add more results of OCRNet #20

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
6445428
update the HRNet-OCR & add ResNet-101-OCR
PkuRainBow Jul 10, 2020
5bd9a74
revise the script
PkuRainBow Jul 10, 2020
6401512
add the results of resnet-101+ocr
PkuRainBow Jul 10, 2020
11967e8
add cascade ocr, aspp ocr
PkuRainBow Jul 11, 2020
5abd0bf
add comparison table
PkuRainBow Jul 11, 2020
9123caa
move comparison table
PkuRainBow Jul 11, 2020
fafb250
support ocr+decoder
PkuRainBow Jul 11, 2020
7f1e74f
revise the ocrnet_sep_aspp
PkuRainBow Jul 11, 2020
dcbce94
update the results of ocrnet
PkuRainBow Jul 12, 2020
5e90f02
update the results of ocrnet
PkuRainBow Jul 12, 2020
a5386c2
add sep-ocr-variants
PkuRainBow Jul 12, 2020
3513703
add bs2x exp of deeplabv3/v3+
PkuRainBow Jul 12, 2020
04e096a
apply sep-conv in ocr module
PkuRainBow Jul 12, 2020
89342ae
update the results
PkuRainBow Jul 13, 2020
a6df4aa
update the results
PkuRainBow Jul 13, 2020
49b9579
update the results of OCRNet
PkuRainBow Jul 15, 2020
5d16592
update the results of OCRNet
PkuRainBow Jul 15, 2020
6ea0489
correct the results
PkuRainBow Jul 15, 2020
9eb8f53
verify the release branch
PkuRainBow Jul 15, 2020
ba1cd91
init the release branch
PkuRainBow Jul 15, 2020
979b5ba
add more results of ocrnet and ocrnetplus
PkuRainBow Jul 15, 2020
05a335f
resolve the conflicts
PkuRainBow Jul 15, 2020
45016d0
rename OCRNetPlus as OCRNet+
PkuRainBow Jul 15, 2020
1987c14
fix the format
PkuRainBow Jul 15, 2020
cbee241
fix the lint issues
PkuRainBow Jul 15, 2020
570eb01
fix the lint issues
PkuRainBow Jul 15, 2020
a0b6814
fix the lint issues
PkuRainBow Jul 15, 2020
a0837de
fix the lint isort issues
PkuRainBow Jul 15, 2020
12b7742
fix the lint yapf issues
PkuRainBow Jul 15, 2020
a43c632
fix the format issues
PkuRainBow Jul 15, 2020
7cde7a8
remove the changes by the master branch
PkuRainBow Jul 16, 2020
df0db0e
remove the changes by the master branch
PkuRainBow Jul 16, 2020
737bf64
remove the changes by the master branch
PkuRainBow Jul 16, 2020
18c361f
remove the changes by the master branch
PkuRainBow Jul 16, 2020
693ab00
remove the changes by the master branch
PkuRainBow Jul 16, 2020
be75fc4
add the logs folder to .gitignore
PkuRainBow Jul 16, 2020
09ca61b
recover .gitignore
PkuRainBow Jul 16, 2020
851d937
update readme
PkuRainBow Jul 16, 2020
34817ad
update readme
PkuRainBow Jul 16, 2020
d886424
reset the cudnn_benchmark
PkuRainBow Jul 16, 2020
261db5b
revise the README of OCRNet
PkuRainBow Jul 16, 2020
a6b01a8
revise the name
PkuRainBow Jul 16, 2020
a940d54
revise the reference of OCRNet
PkuRainBow Jul 16, 2020
71b1db0
revise the Figure of OCRNet+
PkuRainBow Jul 16, 2020
6ea2dd7
update the results of OCR/OCR+
PkuRainBow Jul 23, 2020
72f969c
update the results of OCR/OCR+
PkuRainBow Jul 23, 2020
64590ad
update the results of OCR/OCR+
PkuRainBow Jul 23, 2020
0f74e84
fix the format issue
PkuRainBow Jul 23, 2020
9695587
fix the format issue
PkuRainBow Jul 23, 2020
d769c68
remove the ocr+
PkuRainBow Jul 25, 2020
93c581b
update the results
PkuRainBow Jul 25, 2020
cb38c68
update the results
PkuRainBow Jul 25, 2020
25c18a7
fix the conflicts
PkuRainBow Jul 25, 2020
ed92f07
fix the lint issue
PkuRainBow Jul 25, 2020
a7c181f
fix the lint issue
PkuRainBow Jul 25, 2020
5041616
fix the lint issue
PkuRainBow Jul 25, 2020
55dfe5d
fix the lint issue
PkuRainBow Jul 25, 2020
f59c991
fix the inconsistency
PkuRainBow Jul 25, 2020
7356410
add urls to README
PkuRainBow Jul 25, 2020
d8a9b72
clean the code
PkuRainBow Jul 25, 2020
afa9d09
remove the schedule configs
PkuRainBow Jul 25, 2020
7eb6e74
clean the custom code
PkuRainBow Jul 25, 2020
446fdf2
clean up
xvjiarui Aug 14, 2020
37ac183
remove ocr.png
xvjiarui Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update the results of ocrnet
  • Loading branch information
@PkuRainBow
PkuRainBow committed Jul 12, 2020
commit dcbce940f4195cff462a0e814d7b53c18dd7ecda
1 change: 1 addition & 0 deletions COMPARE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@
| DeepLabV3 | R-101-D8 | 512x512 | 160000 | - | - | 45.00 | 46.66 |
| CCNet | R-101-D8 | 512x512 | 160000 | - | - | 43.71 | 45.04 |
| ANN | R-101-D8 | 512x512 | 160000 | - | - | 42.94 | 44.06 |
| OCRNet | R-101-D8 | 512x512 | 160000 | - | - | 44.38 | - |
| OCRNet (openseg.pytorch) | R-101-D8 | 512x512 | 160000 | - | - | - | 45.28 |
| OCRNet (openseg.pytorch) | HRNetV2p-W48 | 512x512 | 160000 | - | - | - | 45.66 |
0 ...igs/_base_/schedules/schedule_40k_bs2x.py → ...igs/_base_/schedules/schedule_40k_lr2x.py
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions configs/_base_/schedules/schedule_80k_lr2x.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# optimizer
optimizer = dict(type='SGD', lr=0.02, momentum=0.9, weight_decay=0.0005)
optimizer_config = dict()
# learning policy
lr_config = dict(policy='poly', power=0.9, min_lr=1e-4, by_epoch=False)
# runtime settings
total_iters = 80000
checkpoint_config = dict(by_epoch=False, interval=8000, create_symlink=False)
evaluation = dict(interval=8000, metric='mIoU')
11 changes: 8 additions & 3 deletions configs/ocrnet/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,15 @@

| Method | Backbone | Crop Size | Batch Size | Lr schd | Mem (GB) | Inf time (fps) | mIoU | mIoU(ms+flip)|
|--------|--------------------|-----------|-----------|--------:|----------|----------------|------:|--------------:|
| DeepLabV3+ | R-101-D8 | 512x1024 | 8 | 40000 | 11 | 2.60 | 80.21 | 81.82 | <br>
| OCRNet | R-101-D8 | 769x769 | 8 | 40000 | - | - | 79.15 |
| OCRNet | R-50-D8 | 512x1024 | 8 | 40000 | - | - | 78.65 |
| OCRNet | R-101-D8 | 512x1024 | 8 | 40000 | - | - | 79.88 |
| OCRNet | R-101-D8 | 512x1024 | 8 | 40000 | - | - | 79.88 |
| OCRNetPlus (Decoder w/o DepthWiseConv) | R-101-D8 | 512x1024 | 8 | 40000 | - | - | 79.90 |
| OCRNetPlus (Decoder w/ DepthWiseConv) | R-101-D8 | 512x1024 | 8 | 40000 | - | - | 80.33 |
| OCRNetPlus (OCR & Decoder w/ DepthWiseConv) | R-101-D8 | 512x1024 | 8 | 40000 | - | - | - |
| OCRNet | R-101-D8 | 512x1024 | 16 | 40000 | - | - | 80.29 |
| OCRNet | R-101-D8 | 512x1024 | 8 | 80000 | - | - | 79.66 |
| OCRNet | R-101-D8 | 512x1024 | 8 | 80000 | - | - | 79.66 |


### ADE20K
Expand All @@ -57,7 +61,8 @@
|--------|--------------------|-----------|-----------|--------:|----------|----------------|------:|--------------:|
| OCRNet | R-50-D8 | 512x512 | 16 | - | - | - | 41.31 | - |
| OCRNet | R-101-D8 | 512x512 | 16 | - | - | - | 43.64 | - |

| OCRNet | R-101-D8 | 512x512 | 16 | - | - | - | 43.64 | - |
| OCRNet | R-101-D8 | 512x512 | 16 | - | - | - | 44.38 | - |

### Pascal VOC 2012 + Aug
| Method | Backbone | Crop Size | Lr schd | Mem (GB) | Inf time (fps) | mIoU | mIoU(ms+flip) | download |
Expand Down
2 changes: 1 addition & 1 deletion configs/ocrnet/ocrnet_aspp_r50-d8_512x1024_40k_cityscapes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_base_ = [
'../_base_/models/ocrnet_aspp_r50-d8.py', '../_base_/datasets/cityscapes_bs2x.py',
'../_base_/default_runtime.py', '../_base_/schedules/schedule_40k_bs2x.py'
'../_base_/default_runtime.py', '../_base_/schedules/schedule_40k_lr2x.py'
]
2 changes: 1 addition & 1 deletion configs/ocrnet/ocrnet_hr18_bs2x_512x1024_40k_cityscapes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_base_ = [
'../_base_/models/ocrnet_hr18.py', '../_base_/datasets/cityscapes_bs2x.py',
'../_base_/default_runtime.py', '../_base_/schedules/schedule_40k_bs2x.py'
'../_base_/default_runtime.py', '../_base_/schedules/schedule_40k_lr2x.py'
]
33 changes: 33 additions & 0 deletions configs/ocrnet/ocrnet_r50-d8_512x512_80k_lr2x_ade20k.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
_base_ = [
'../_base_/models/ocrnet_r50-d8.py', '../_base_/datasets/ade20k.py',
'../_base_/default_runtime.py', '../_base_/schedules/schedule_80k_lr2x.py'
]
norm_cfg = dict(type='SyncBN', requires_grad=True)
model = dict(decode_head=[
dict(
type='FCNHead',
in_channels=1024,
in_index=2,
channels=256,
num_convs=1,
concat_input=False,
drop_out_ratio=0.1,
num_classes=150,
norm_cfg=norm_cfg,
align_corners=False,
loss_decode=dict(
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=0.4)),
dict(
type='OCRHead',
in_channels=2048,
in_index=3,
channels=512,
ocr_channels=256,
drop_out_ratio=0.1,
num_classes=150,
norm_cfg=norm_cfg,
align_corners=False,
loss_decode=dict(
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0))
])

2 changes: 1 addition & 1 deletion configs/ocrnet/ocrnet_r50-d8_bs2x_512x1024_40k_cityscapes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_base_ = [
'../_base_/models/ocrnet_r50-d8.py', '../_base_/datasets/cityscapes_bs2x.py',
'../_base_/default_runtime.py', '../_base_/schedules/schedule_40k_bs2x.py'
'../_base_/default_runtime.py', '../_base_/schedules/schedule_40k_lr2x.py'
]
2 changes: 1 addition & 1 deletion configs/ocrnet/ocrnet_sep_aspp_r50-d8_512x1024_40k_cityscapes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
_base_ = [
'../_base_/models/ocrnet_sep_aspp_r50-d8.py', '../_base_/datasets/cityscapes_bs2x.py',
'../_base_/default_runtime.py', '../_base_/schedules/schedule_40k_bs2x.py'
'../_base_/default_runtime.py', '../_base_/schedules/schedule_40k_lr2x.py'
]
1 change: 0 additions & 1 deletion configs/ocrnet/ocrnetplus_r50-d8_512x512_80k_ade20k.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,3 @@
loss_decode=dict(
type='CrossEntropyLoss', use_sigmoid=False, loss_weight=1.0))
])