Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
znstj
PaddleOCR
提交
dec76eb7
P
PaddleOCR
项目概览
znstj
/
PaddleOCR
与 Fork 源项目一致
Fork自
PaddlePaddle / PaddleOCR
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleOCR
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
dec76eb7
编写于
6月 08, 2021
作者:
W
WenmuZhou
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add pad for small image in det
上级
48eba028
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
23 addition
and
11 deletion
+23
-11
ppocr/data/imaug/operators.py
ppocr/data/imaug/operators.py
+10
-2
ppocr/postprocess/db_postprocess.py
ppocr/postprocess/db_postprocess.py
+5
-6
ppstructure/predict_system.py
ppstructure/predict_system.py
+3
-2
tools/infer/predict_det.py
tools/infer/predict_det.py
+3
-1
tools/infer/utility.py
tools/infer/utility.py
+2
-0
未找到文件。
ppocr/data/imaug/operators.py
浏览文件 @
dec76eb7
...
...
@@ -81,7 +81,7 @@ class NormalizeImage(object):
assert
isinstance
(
img
,
np
.
ndarray
),
"invalid input 'img' in NormalizeImage"
data
[
'image'
]
=
(
img
.
astype
(
'float32'
)
*
self
.
scale
-
self
.
mean
)
/
self
.
std
img
.
astype
(
'float32'
)
*
self
.
scale
-
self
.
mean
)
/
self
.
std
return
data
...
...
@@ -122,6 +122,8 @@ class DetResizeForTest(object):
elif
'limit_side_len'
in
kwargs
:
self
.
limit_side_len
=
kwargs
[
'limit_side_len'
]
self
.
limit_type
=
kwargs
.
get
(
'limit_type'
,
'min'
)
self
.
pad
=
kwargs
.
get
(
'pad'
,
False
)
self
.
pad_size
=
kwargs
.
get
(
'pad_size'
,
480
)
elif
'resize_long'
in
kwargs
:
self
.
resize_type
=
2
self
.
resize_long
=
kwargs
.
get
(
'resize_long'
,
960
)
...
...
@@ -163,7 +165,7 @@ class DetResizeForTest(object):
img, (ratio_h, ratio_w)
"""
limit_side_len
=
self
.
limit_side_len
h
,
w
,
_
=
img
.
shape
h
,
w
,
c
=
img
.
shape
# limit the max side
if
self
.
limit_type
==
'max'
:
...
...
@@ -172,6 +174,8 @@ class DetResizeForTest(object):
ratio
=
float
(
limit_side_len
)
/
h
else
:
ratio
=
float
(
limit_side_len
)
/
w
elif
self
.
pad
:
ratio
=
float
(
self
.
pad_size
)
/
max
(
h
,
w
)
else
:
ratio
=
1.
else
:
...
...
@@ -197,6 +201,10 @@ class DetResizeForTest(object):
sys
.
exit
(
0
)
ratio_h
=
resize_h
/
float
(
h
)
ratio_w
=
resize_w
/
float
(
w
)
if
self
.
limit_type
==
'max'
and
self
.
pad
:
padding_im
=
np
.
zeros
((
self
.
pad_size
,
self
.
pad_size
,
c
),
dtype
=
np
.
float32
)
padding_im
[:
resize_h
,
:
resize_w
,
:]
=
img
img
=
padding_im
return
img
,
[
ratio_h
,
ratio_w
]
def
resize_image_type2
(
self
,
img
):
...
...
ppocr/postprocess/db_postprocess.py
浏览文件 @
dec76eb7
...
...
@@ -49,12 +49,12 @@ class DBPostProcess(object):
self
.
dilation_kernel
=
None
if
not
use_dilation
else
np
.
array
(
[[
1
,
1
],
[
1
,
1
]])
def
boxes_from_bitmap
(
self
,
pred
,
_bitmap
,
dest_width
,
dest_height
):
def
boxes_from_bitmap
(
self
,
pred
,
_bitmap
,
shape
):
'''
_bitmap: single map with shape (1, H, W),
whose values are binarized as {0, 1}
'''
dest_height
,
dest_width
,
ratio_h
,
ratio_w
=
shape
bitmap
=
_bitmap
height
,
width
=
bitmap
.
shape
...
...
@@ -89,9 +89,9 @@ class DBPostProcess(object):
box
=
np
.
array
(
box
)
box
[:,
0
]
=
np
.
clip
(
np
.
round
(
box
[:,
0
]
/
width
*
dest_width
),
0
,
dest_width
)
np
.
round
(
box
[:,
0
]
/
ratio_w
),
0
,
dest_width
)
box
[:,
1
]
=
np
.
clip
(
np
.
round
(
box
[:,
1
]
/
height
*
dest_height
),
0
,
dest_height
)
np
.
round
(
box
[:,
1
]
/
ratio_h
),
0
,
dest_height
)
boxes
.
append
(
box
.
astype
(
np
.
int16
))
scores
.
append
(
score
)
return
np
.
array
(
boxes
,
dtype
=
np
.
int16
),
scores
...
...
@@ -175,7 +175,6 @@ class DBPostProcess(object):
boxes_batch
=
[]
for
batch_index
in
range
(
pred
.
shape
[
0
]):
src_h
,
src_w
,
ratio_h
,
ratio_w
=
shape_list
[
batch_index
]
if
self
.
dilation_kernel
is
not
None
:
mask
=
cv2
.
dilate
(
np
.
array
(
segmentation
[
batch_index
]).
astype
(
np
.
uint8
),
...
...
@@ -183,7 +182,7 @@ class DBPostProcess(object):
else
:
mask
=
segmentation
[
batch_index
]
boxes
,
scores
=
self
.
boxes_from_bitmap
(
pred
[
batch_index
],
mask
,
s
rc_w
,
src_h
)
s
hape_list
[
batch_index
]
)
boxes_batch
.
append
({
'points'
:
boxes
})
return
boxes_batch
ppstructure/predict_system.py
浏览文件 @
dec76eb7
...
...
@@ -38,11 +38,13 @@ logger = get_logger()
class
OCRSystem
(
object
):
def
__init__
(
self
,
args
):
args
.
det_pad
=
True
args
.
det_pad_size
=
640
self
.
text_system
=
TextSystem
(
args
)
self
.
table_system
=
TableSystem
(
args
,
self
.
text_system
.
text_detector
,
self
.
text_system
.
text_recognizer
)
self
.
table_layout
=
lp
.
PaddleDetectionLayoutModel
(
"lp://PubLayNet/ppyolov2_r50vd_dcn_365e_publaynet/config"
,
threshold
=
0.5
,
enable_mkldnn
=
args
.
enable_mkldnn
,
enforce_cpu
=
not
args
.
use_gpu
,
thread_num
=
args
.
cpu_threads
)
enforce_cpu
=
not
args
.
use_gpu
,
thread_num
=
args
.
cpu_threads
)
self
.
use_angle_cls
=
args
.
use_angle_cls
self
.
drop_score
=
args
.
drop_score
...
...
@@ -67,7 +69,6 @@ class OCRSystem(object):
res_list
.
append
({
'type'
:
region
.
type
,
'bbox'
:
[
x1
,
y1
,
x2
,
y2
],
'res'
:
res
})
return
res_list
def
save_res
(
res
,
save_folder
,
img_name
):
excel_save_folder
=
os
.
path
.
join
(
save_folder
,
img_name
)
os
.
makedirs
(
excel_save_folder
,
exist_ok
=
True
)
...
...
tools/infer/predict_det.py
浏览文件 @
dec76eb7
...
...
@@ -41,7 +41,9 @@ class TextDetector(object):
pre_process_list
=
[{
'DetResizeForTest'
:
{
'limit_side_len'
:
args
.
det_limit_side_len
,
'limit_type'
:
args
.
det_limit_type
'limit_type'
:
args
.
det_limit_type
,
'pad'
:
args
.
det_pad
,
'pad_size'
:
args
.
det_pad_size
}
},
{
'NormalizeImage'
:
{
...
...
tools/infer/utility.py
浏览文件 @
dec76eb7
...
...
@@ -46,6 +46,8 @@ def init_args():
parser
.
add_argument
(
"--det_model_dir"
,
type
=
str
)
parser
.
add_argument
(
"--det_limit_side_len"
,
type
=
float
,
default
=
960
)
parser
.
add_argument
(
"--det_limit_type"
,
type
=
str
,
default
=
'max'
)
parser
.
add_argument
(
"--det_pad"
,
type
=
str2bool
,
default
=
False
)
parser
.
add_argument
(
"--det_pad_size"
,
type
=
int
,
default
=
640
)
# DB parmas
parser
.
add_argument
(
"--det_db_thresh"
,
type
=
float
,
default
=
0.3
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录