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
e3d6aac9
Commit
e3d6aac9
authored
Jan 10, 2022
by
WenmuZhou
Browse files
rm model type check
parent
8375a874
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
8 deletions
+6
-8
paddleocr.py
paddleocr.py
+6
-8
No files found.
paddleocr.py
View file @
e3d6aac9
...
@@ -190,6 +190,7 @@ def parse_args(mMain=True):
...
@@ -190,6 +190,7 @@ def parse_args(mMain=True):
parser
.
add_argument
(
parser
.
add_argument
(
"--ocr_version"
,
"--ocr_version"
,
type
=
str
,
type
=
str
,
choices
=
[
'PP-OCR'
,
'PP-OCRv2'
],
default
=
'PP-OCRv2'
,
default
=
'PP-OCRv2'
,
help
=
'OCR Model version, the current model support list is as follows: '
help
=
'OCR Model version, the current model support list is as follows: '
'1. PP-OCRv2 Support Chinese detection and recognition model. '
'1. PP-OCRv2 Support Chinese detection and recognition model. '
...
@@ -198,6 +199,7 @@ def parse_args(mMain=True):
...
@@ -198,6 +199,7 @@ def parse_args(mMain=True):
parser
.
add_argument
(
parser
.
add_argument
(
"--structure_version"
,
"--structure_version"
,
type
=
str
,
type
=
str
,
choices
=
[
'STRUCTURE'
],
default
=
'STRUCTURE'
,
default
=
'STRUCTURE'
,
help
=
'Model version, the current model support list is as follows:'
help
=
'Model version, the current model support list is as follows:'
' 1. STRUCTURE Support en table structure model.'
)
' 1. STRUCTURE Support en table structure model.'
)
...
@@ -257,26 +259,20 @@ def get_model_config(type, version, model_type, lang):
...
@@ -257,26 +259,20 @@ def get_model_config(type, version, model_type, lang):
DEFAULT_MODEL_VERSION
=
DEFAULT_STRUCTURE_MODEL_VERSION
DEFAULT_MODEL_VERSION
=
DEFAULT_STRUCTURE_MODEL_VERSION
else
:
else
:
raise
NotImplementedError
raise
NotImplementedError
model_urls
=
MODEL_URLS
[
type
]
model_urls
=
MODEL_URLS
[
type
]
if
version
not
in
model_urls
:
if
version
not
in
model_urls
:
logger
.
warning
(
'version {} not in {}, auto switch to version {}'
.
format
(
version
,
model_urls
.
keys
(),
DEFAULT_MODEL_VERSION
))
version
=
DEFAULT_MODEL_VERSION
version
=
DEFAULT_MODEL_VERSION
if
model_type
not
in
model_urls
[
version
]:
if
model_type
not
in
model_urls
[
version
]:
if
model_type
in
model_urls
[
DEFAULT_MODEL_VERSION
]:
if
model_type
in
model_urls
[
DEFAULT_MODEL_VERSION
]:
logger
.
warning
(
'version {} not support {} models, auto switch to version {}'
.
format
(
version
,
model_type
,
DEFAULT_MODEL_VERSION
))
version
=
DEFAULT_MODEL_VERSION
version
=
DEFAULT_MODEL_VERSION
else
:
else
:
logger
.
error
(
'{} models is not support, we only support {}'
.
format
(
logger
.
error
(
'{} models is not support, we only support {}'
.
format
(
model_type
,
model_urls
[
DEFAULT_MODEL_VERSION
].
keys
()))
model_type
,
model_urls
[
DEFAULT_MODEL_VERSION
].
keys
()))
sys
.
exit
(
-
1
)
sys
.
exit
(
-
1
)
if
lang
not
in
model_urls
[
version
][
model_type
]:
if
lang
not
in
model_urls
[
version
][
model_type
]:
if
lang
in
model_urls
[
DEFAULT_MODEL_VERSION
][
model_type
]:
if
lang
in
model_urls
[
DEFAULT_MODEL_VERSION
][
model_type
]:
logger
.
warning
(
'lang {} is not support in {}, auto switch to version {}'
.
format
(
lang
,
version
,
DEFAULT_MODEL_VERSION
))
version
=
DEFAULT_MODEL_VERSION
version
=
DEFAULT_MODEL_VERSION
else
:
else
:
logger
.
error
(
logger
.
error
(
...
@@ -296,6 +292,7 @@ class PaddleOCR(predict_system.TextSystem):
...
@@ -296,6 +292,7 @@ class PaddleOCR(predict_system.TextSystem):
"""
"""
params
=
parse_args
(
mMain
=
False
)
params
=
parse_args
(
mMain
=
False
)
params
.
__dict__
.
update
(
**
kwargs
)
params
.
__dict__
.
update
(
**
kwargs
)
assert
params
.
ocr_version
in
[
'PP-OCR'
,
'PP-OCRv2'
]
params
.
use_gpu
=
check_gpu
(
params
.
use_gpu
)
params
.
use_gpu
=
check_gpu
(
params
.
use_gpu
)
if
not
params
.
show_log
:
if
not
params
.
show_log
:
...
@@ -398,6 +395,7 @@ class PPStructure(OCRSystem):
...
@@ -398,6 +395,7 @@ class PPStructure(OCRSystem):
def
__init__
(
self
,
**
kwargs
):
def
__init__
(
self
,
**
kwargs
):
params
=
parse_args
(
mMain
=
False
)
params
=
parse_args
(
mMain
=
False
)
params
.
__dict__
.
update
(
**
kwargs
)
params
.
__dict__
.
update
(
**
kwargs
)
assert
params
.
structure_version
in
[
'STRUCTURE'
]
params
.
use_gpu
=
check_gpu
(
params
.
use_gpu
)
params
.
use_gpu
=
check_gpu
(
params
.
use_gpu
)
if
not
params
.
show_log
:
if
not
params
.
show_log
:
...
...
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