Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wangsen
paddle_dbnet
Commits
81cce82b
Unverified
Commit
81cce82b
authored
Mar 17, 2021
by
zhoujun
Committed by
GitHub
Mar 17, 2021
Browse files
Merge pull request #2093 from WenmuZhou/fix_doc
Fix bug of use custom dict
parents
ddbba2b1
ae7e1502
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
paddleocr.py
paddleocr.py
+11
-4
setup.py
setup.py
+1
-1
No files found.
paddleocr.py
View file @
81cce82b
...
...
@@ -236,7 +236,9 @@ class PaddleOCR(predict_system.TextSystem):
assert
lang
in
model_urls
[
'rec'
],
'param lang must in {}, but got {}'
.
format
(
model_urls
[
'rec'
].
keys
(),
lang
)
use_inner_dict
=
False
if
postprocess_params
.
rec_char_dict_path
is
None
:
use_inner_dict
=
True
postprocess_params
.
rec_char_dict_path
=
model_urls
[
'rec'
][
lang
][
'dict_path'
]
...
...
@@ -263,9 +265,9 @@ class PaddleOCR(predict_system.TextSystem):
if
postprocess_params
.
rec_algorithm
not
in
SUPPORT_REC_MODEL
:
logger
.
error
(
'rec_algorithm must in {}'
.
format
(
SUPPORT_REC_MODEL
))
sys
.
exit
(
0
)
postprocess_params
.
rec_char_dict_path
=
str
(
Path
(
__file__
).
parent
/
postprocess_params
.
rec_char_dict_path
)
if
use_inner_dict
:
postprocess_params
.
rec_char_dict_path
=
str
(
Path
(
__file__
).
parent
/
postprocess_params
.
rec_char_dict_path
)
# init det_model and rec_model
super
().
__init__
(
postprocess_params
)
...
...
@@ -282,8 +284,13 @@ class PaddleOCR(predict_system.TextSystem):
if
isinstance
(
img
,
list
)
and
det
==
True
:
logger
.
error
(
'When input a list of images, det must be false'
)
exit
(
0
)
if
cls
==
False
:
self
.
use_angle_cls
=
False
elif
cls
==
True
and
self
.
use_angle_cls
==
False
:
logger
.
warning
(
'Since the angle classifier is not initialized, the angle classifier will not be uesd during the forward process'
)
self
.
use_angle_cls
=
cls
if
isinstance
(
img
,
str
):
# download net image
if
img
.
startswith
(
'http'
):
...
...
setup.py
View file @
81cce82b
...
...
@@ -32,7 +32,7 @@ setup(
package_dir
=
{
'paddleocr'
:
''
},
include_package_data
=
True
,
entry_points
=
{
"console_scripts"
:
[
"paddleocr= paddleocr.paddleocr:main"
]},
version
=
'2.0.
2
'
,
version
=
'2.0.
3
'
,
install_requires
=
requirements
,
license
=
'Apache License 2.0'
,
description
=
'Awesome OCR toolkits based on PaddlePaddle (8.6M ultra-lightweight pre-trained model, support training and deployment among server, mobile, embeded and IoT devices'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment