提交 4590f912 编写于 作者: 文幕地方's avatar 文幕地方

add hit

上级 e3d6aac9
...@@ -47,7 +47,9 @@ SUPPORT_REC_MODEL = ['CRNN'] ...@@ -47,7 +47,9 @@ SUPPORT_REC_MODEL = ['CRNN']
BASE_DIR = os.path.expanduser("~/.paddleocr/") BASE_DIR = os.path.expanduser("~/.paddleocr/")
DEFAULT_OCR_MODEL_VERSION = 'PP-OCR' DEFAULT_OCR_MODEL_VERSION = 'PP-OCR'
SUPPORT_OCR_MODEL_VERSION = ['PP-OCR', 'PP-OCRv2']
DEFAULT_STRUCTURE_MODEL_VERSION = 'STRUCTURE' DEFAULT_STRUCTURE_MODEL_VERSION = 'STRUCTURE'
SUPPORT_STRUCTURE_MODEL_VERSION = ['STRUCTURE']
MODEL_URLS = { MODEL_URLS = {
'OCR': { 'OCR': {
'PP-OCRv2': { 'PP-OCRv2': {
...@@ -190,7 +192,7 @@ def parse_args(mMain=True): ...@@ -190,7 +192,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'], choices=SUPPORT_OCR_MODEL_VERSION,
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. '
...@@ -199,7 +201,7 @@ def parse_args(mMain=True): ...@@ -199,7 +201,7 @@ def parse_args(mMain=True):
parser.add_argument( parser.add_argument(
"--structure_version", "--structure_version",
type=str, type=str,
choices=['STRUCTURE'], choices=SUPPORT_STRUCTURE_MODEL_VERSION,
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.')
...@@ -292,7 +294,7 @@ class PaddleOCR(predict_system.TextSystem): ...@@ -292,7 +294,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'] assert params.ocr_version in SUPPORT_OCR_MODEL_VERSION, "ocr_version must in {}, but get {}".format(SUPPORT_OCR_MODEL_VERSION,params.ocr_version)
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:
...@@ -395,7 +397,7 @@ class PPStructure(OCRSystem): ...@@ -395,7 +397,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'] assert params.structure_version in SUPPORT_STRUCTURE_MODEL_VERSION, "ocr_version must in {}, but get {}".format(SUPPORT_STRUCTURE_MODEL_VERSION,params.structure_version)
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:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册