From 6fb4e3bb2568e76828080e059bfd60f2e76c02ea Mon Sep 17 00:00:00 2001 From: SWHL Date: Sat, 13 May 2023 15:52:07 +0800 Subject: [PATCH] Optim api interface for easy packaging --- .../ch_ppocr_v2_cls/__init__.py | 2 +- .../ch_ppocr_v3_rec/__init__.py | 2 +- python/rapidocr_onnxruntime/config.yaml | 6 ------ python/rapidocr_onnxruntime/rapid_ocr_api.py | 13 ++++--------- .../rapidocr_openvino/ch_ppocr_v2_cls/__init__.py | 2 +- .../rapidocr_openvino/ch_ppocr_v3_det/__init__.py | 2 +- .../rapidocr_openvino/ch_ppocr_v3_rec/__init__.py | 5 ++++- python/rapidocr_openvino/rapid_ocr_api.py | 13 ++++--------- 8 files changed, 16 insertions(+), 29 deletions(-) diff --git a/python/rapidocr_onnxruntime/ch_ppocr_v2_cls/__init__.py b/python/rapidocr_onnxruntime/ch_ppocr_v2_cls/__init__.py index c5a5e1f..7fc854c 100644 --- a/python/rapidocr_onnxruntime/ch_ppocr_v2_cls/__init__.py +++ b/python/rapidocr_onnxruntime/ch_ppocr_v2_cls/__init__.py @@ -1,4 +1,4 @@ # -*- encoding: utf-8 -*- # @Author: SWHL # @Contact: liekkaskono@163.com -from .text_cls import TextClassifier \ No newline at end of file +from .text_cls import TextClassifier diff --git a/python/rapidocr_onnxruntime/ch_ppocr_v3_rec/__init__.py b/python/rapidocr_onnxruntime/ch_ppocr_v3_rec/__init__.py index ea54cd3..37eafdc 100644 --- a/python/rapidocr_onnxruntime/ch_ppocr_v3_rec/__init__.py +++ b/python/rapidocr_onnxruntime/ch_ppocr_v3_rec/__init__.py @@ -1,4 +1,4 @@ # -*- encoding: utf-8 -*- # @Author: SWHL # @Contact: liekkaskono@163.com -from .text_recognize import TextRecognizer \ No newline at end of file +from .text_recognize import TextRecognizer diff --git a/python/rapidocr_onnxruntime/config.yaml b/python/rapidocr_onnxruntime/config.yaml index b339f12..4607d7d 100644 --- a/python/rapidocr_onnxruntime/config.yaml +++ b/python/rapidocr_onnxruntime/config.yaml @@ -9,8 +9,6 @@ Global: Det: use_cuda: false - module_name: ch_ppocr_v3_det - class_name: TextDetector model_path: models/ch_PP-OCRv3_det_infer.onnx limit_side_len: 736 @@ -26,8 +24,6 @@ Det: Cls: use_cuda: false - module_name: ch_ppocr_v2_cls - class_name: TextClassifier model_path: models/ch_ppocr_mobile_v2.0_cls_infer.onnx cls_image_shape: [3, 48, 192] @@ -38,8 +34,6 @@ Cls: Rec: use_cuda: false - module_name: ch_ppocr_v3_rec - class_name: TextRecognizer model_path: models/ch_PP-OCRv3_rec_infer.onnx rec_img_shape: [3, 48, 320] diff --git a/python/rapidocr_onnxruntime/rapid_ocr_api.py b/python/rapidocr_onnxruntime/rapid_ocr_api.py index 30283df..7f92c0f 100644 --- a/python/rapidocr_onnxruntime/rapid_ocr_api.py +++ b/python/rapidocr_onnxruntime/rapid_ocr_api.py @@ -3,18 +3,19 @@ # @Contact: liekkaskono@163.com import copy import importlib -import sys from pathlib import Path from typing import Union import cv2 import numpy as np -from .utils import (LoadImage, init_args, UpdateParameters, concat_model_path, +from .ch_ppocr_v2_cls import TextClassifier +from .ch_ppocr_v3_det import TextDetector +from .ch_ppocr_v3_rec import TextRecognizer +from .utils import (LoadImage, UpdateParameters, concat_model_path, init_args, read_yaml) root_dir = Path(__file__).resolve().parent -sys.path.append(str(root_dir)) class RapidOCR(): @@ -37,18 +38,12 @@ class RapidOCR(): self.use_text_det = config['Global']['use_text_det'] if self.use_text_det: - TextDetector = self.init_module(config['Det']['module_name'], - config['Det']['class_name']) self.text_detector = TextDetector(config['Det']) - TextRecognizer = self.init_module(config['Rec']['module_name'], - config['Rec']['class_name']) self.text_recognizer = TextRecognizer(config['Rec']) self.use_angle_cls = config['Global']['use_angle_cls'] if self.use_angle_cls: - TextClassifier = self.init_module(config['Cls']['module_name'], - config['Cls']['class_name']) self.text_cls = TextClassifier(config['Cls']) self.load_img = LoadImage() diff --git a/python/rapidocr_openvino/ch_ppocr_v2_cls/__init__.py b/python/rapidocr_openvino/ch_ppocr_v2_cls/__init__.py index c5a5e1f..7fc854c 100644 --- a/python/rapidocr_openvino/ch_ppocr_v2_cls/__init__.py +++ b/python/rapidocr_openvino/ch_ppocr_v2_cls/__init__.py @@ -1,4 +1,4 @@ # -*- encoding: utf-8 -*- # @Author: SWHL # @Contact: liekkaskono@163.com -from .text_cls import TextClassifier \ No newline at end of file +from .text_cls import TextClassifier diff --git a/python/rapidocr_openvino/ch_ppocr_v3_det/__init__.py b/python/rapidocr_openvino/ch_ppocr_v3_det/__init__.py index dd23c8b..502f4a3 100644 --- a/python/rapidocr_openvino/ch_ppocr_v3_det/__init__.py +++ b/python/rapidocr_openvino/ch_ppocr_v3_det/__init__.py @@ -1,4 +1,4 @@ # -*- encoding: utf-8 -*- # @Author: SWHL # @Contact: liekkaskono@163.com -from .text_detect import TextDetector \ No newline at end of file +from .text_detect import TextDetector diff --git a/python/rapidocr_openvino/ch_ppocr_v3_rec/__init__.py b/python/rapidocr_openvino/ch_ppocr_v3_rec/__init__.py index 686ffdd..37eafdc 100644 --- a/python/rapidocr_openvino/ch_ppocr_v3_rec/__init__.py +++ b/python/rapidocr_openvino/ch_ppocr_v3_rec/__init__.py @@ -1 +1,4 @@ -from .text_recognize import TextRecognizer \ No newline at end of file +# -*- encoding: utf-8 -*- +# @Author: SWHL +# @Contact: liekkaskono@163.com +from .text_recognize import TextRecognizer diff --git a/python/rapidocr_openvino/rapid_ocr_api.py b/python/rapidocr_openvino/rapid_ocr_api.py index 30283df..7f92c0f 100644 --- a/python/rapidocr_openvino/rapid_ocr_api.py +++ b/python/rapidocr_openvino/rapid_ocr_api.py @@ -3,18 +3,19 @@ # @Contact: liekkaskono@163.com import copy import importlib -import sys from pathlib import Path from typing import Union import cv2 import numpy as np -from .utils import (LoadImage, init_args, UpdateParameters, concat_model_path, +from .ch_ppocr_v2_cls import TextClassifier +from .ch_ppocr_v3_det import TextDetector +from .ch_ppocr_v3_rec import TextRecognizer +from .utils import (LoadImage, UpdateParameters, concat_model_path, init_args, read_yaml) root_dir = Path(__file__).resolve().parent -sys.path.append(str(root_dir)) class RapidOCR(): @@ -37,18 +38,12 @@ class RapidOCR(): self.use_text_det = config['Global']['use_text_det'] if self.use_text_det: - TextDetector = self.init_module(config['Det']['module_name'], - config['Det']['class_name']) self.text_detector = TextDetector(config['Det']) - TextRecognizer = self.init_module(config['Rec']['module_name'], - config['Rec']['class_name']) self.text_recognizer = TextRecognizer(config['Rec']) self.use_angle_cls = config['Global']['use_angle_cls'] if self.use_angle_cls: - TextClassifier = self.init_module(config['Cls']['module_name'], - config['Cls']['class_name']) self.text_cls = TextClassifier(config['Cls']) self.load_img = LoadImage()