yujunjun/PaddleOCR
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/PaddleOCR.git synced 2025-06-26 21:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in whl import fce

Browse Source
This commit is contained in:
WenmuZhou 2022-03-18 10:08:58 +00:00
parent 496887f83f
commit f85b3ea8eb
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MANIFEST.in
View File

@ -1,7 +1,7 @@
include LICENSE include LICENSE
include README.md include README.md
recursive-include ppocr/utils *.txt utility.py logging.py network.py recursive-include ppocr/utils *.*
recursive-include ppocr/data *.py recursive-include ppocr/data *.py
recursive-include ppocr/postprocess *.py recursive-include ppocr/postprocess *.py
recursive-include tools/infer *.py recursive-include tools/infer *.py

20
paddleocr.py
View File

@ -42,7 +42,7 @@ __all__ = [
] ]
SUPPORT_DET_MODEL = ['DB'] SUPPORT_DET_MODEL = ['DB']
VERSION = '2.4.0.1' VERSION = '2.4.0.2'
SUPPORT_REC_MODEL = ['CRNN'] SUPPORT_REC_MODEL = ['CRNN']
BASE_DIR = os.path.expanduser("~/.paddleocr/") BASE_DIR = os.path.expanduser("~/.paddleocr/")
@ -308,20 +308,18 @@ class PaddleOCR(predict_system.TextSystem):
det_lang) det_lang)
params.det_model_dir, det_url = confirm_model_dir_url( params.det_model_dir, det_url = confirm_model_dir_url(
params.det_model_dir, params.det_model_dir,
os.path.join(BASE_DIR, VERSION, 'ocr', 'det', det_lang), os.path.join(BASE_DIR, 'whl', 'det', det_lang),
det_model_config['url']) det_model_config['url'])
rec_model_config = get_model_config('OCR', params.ocr_version, 'rec', rec_model_config = get_model_config('OCR', params.ocr_version, 'rec',
lang) lang)
params.rec_model_dir, rec_url = confirm_model_dir_url( params.rec_model_dir, rec_url = confirm_model_dir_url(
params.rec_model_dir, params.rec_model_dir,
os.path.join(BASE_DIR, VERSION, 'ocr', 'rec', lang), os.path.join(BASE_DIR, 'whl', 'rec', lang), rec_model_config['url'])
rec_model_config['url'])
cls_model_config = get_model_config('OCR', params.ocr_version, 'cls', cls_model_config = get_model_config('OCR', params.ocr_version, 'cls',
'ch') 'ch')
params.cls_model_dir, cls_url = confirm_model_dir_url( params.cls_model_dir, cls_url = confirm_model_dir_url(
params.cls_model_dir, params.cls_model_dir,
os.path.join(BASE_DIR, VERSION, 'ocr', 'cls'), os.path.join(BASE_DIR, 'whl', 'cls'), cls_model_config['url'])
cls_model_config['url'])
# download model # download model
maybe_download(params.det_model_dir, det_url) maybe_download(params.det_model_dir, det_url)
maybe_download(params.rec_model_dir, rec_url) maybe_download(params.rec_model_dir, rec_url)
@ -412,20 +410,18 @@ class PPStructure(OCRSystem):
det_lang) det_lang)
params.det_model_dir, det_url = confirm_model_dir_url( params.det_model_dir, det_url = confirm_model_dir_url(
params.det_model_dir, params.det_model_dir,
os.path.join(BASE_DIR, VERSION, 'ocr', 'det', det_lang), os.path.join(BASE_DIR, 'whl', 'det', det_lang),
det_model_config['url']) det_model_config['url'])
rec_model_config = get_model_config('OCR', params.ocr_version, 'rec', rec_model_config = get_model_config('OCR', params.ocr_version, 'rec',
lang) lang)
params.rec_model_dir, rec_url = confirm_model_dir_url( params.rec_model_dir, rec_url = confirm_model_dir_url(
params.rec_model_dir, params.rec_model_dir,
os.path.join(BASE_DIR, VERSION, 'ocr', 'rec', lang), os.path.join(BASE_DIR, 'whl', 'rec', lang), rec_model_config['url'])
rec_model_config['url'])
table_model_config = get_model_config( table_model_config = get_model_config(
'STRUCTURE', params.structure_version, 'table', 'en') 'STRUCTURE', params.structure_version, 'table', 'en')
params.table_model_dir, table_url = confirm_model_dir_url( params.table_model_dir, table_url = confirm_model_dir_url(
params.table_model_dir, params.table_model_dir,
os.path.join(BASE_DIR, VERSION, 'ocr', 'table'), os.path.join(BASE_DIR, 'whl', 'table'), table_model_config['url'])
table_model_config['url'])
# download model # download model
maybe_download(params.det_model_dir, det_url) maybe_download(params.det_model_dir, det_url)
maybe_download(params.rec_model_dir, rec_url) maybe_download(params.rec_model_dir, rec_url)
@ -499,4 +495,4 @@ def main():
for item in result: for item in result:
item.pop('img') item.pop('img')
logger.info(item) logger.info(item)

1
tools/infer/utility.py
View File

@ -622,7 +622,6 @@ def get_rotate_crop_image(img, points):
def check_gpu(use_gpu): def check_gpu(use_gpu):
if use_gpu and not paddle.is_compiled_with_cuda(): if use_gpu and not paddle.is_compiled_with_cuda():
use_gpu = False use_gpu = False
return use_gpu return use_gpu