Add PaddleOCRv3 & PaddleOCRv2 Support (#139)

* Add PaddleOCR Support

* Add PaddleOCR Support

* Add PaddleOCRv3 Support

* Add PaddleOCRv3 Support

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Add PaddleOCRv3 Support

* Add PaddleOCRv3 Supports

* Add PaddleOCRv3 Suport

* Fix Rec diff

* Remove useless functions

* Remove useless comments

* Add PaddleOCRv2 Support

fastdeploy/vision/__init__.py

@@ -20,6 +20,6 @@ from . import segmentation
 from . import matting
 from . import facedet
 from . import faceid
-
+from . import ocr
 from . import evaluation
 from .visualize import *

fastdeploy/vision/ocr/__init__.py

@@ -0,0 +1,20 @@
+# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from __future__ import absolute_import
+
+from .ppocr import PPOCRSystemv3
+from .ppocr import PPOCRSystemv2
+from .ppocr import DBDetector
+from .ppocr import Classifier
+from .ppocr import Recognizer

fastdeploy/vision/ocr/ppocr/__init__.py

@@ -0,0 +1,234 @@
+# # Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
+# #
+# # Licensed under the Apache License, Version 2.0 (the "License");
+# # you may not use this file except in compliance with the License.
+# # You may obtain a copy of the License at
+# #
+# #     http://www.apache.org/licenses/LICENSE-2.0
+# #
+# # Unless required by applicable law or agreed to in writing, software
+# # distributed under the License is distributed on an "AS IS" BASIS,
+# # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# # See the License for the specific language governing permissions and
+# # limitations under the License.
+
+from __future__ import absolute_import
+import logging
+from .... import FastDeployModel, Frontend
+from .... import c_lib_wrap as C
+
+
+class DBDetector(FastDeployModel):
+    def __init__(self,
+                 model_file="",
+                 params_file="",
+                 runtime_option=None,
+                 model_format=Frontend.PADDLE):
+        # 调用基函数进行backend_option的初始化
+        # 初始化后的option保存在self._runtime_option
+        super(DBDetector, self).__init__(runtime_option)
+
+        if (len(model_file) == 0):
+            self._model = C.vision.ocr.DBDetector()
+        else:
+            self._model = C.vision.ocr.DBDetector(
+                model_file, params_file, self._runtime_option, model_format)
+            # 通过self.initialized判断整个模型的初始化是否成功
+            assert self.initialized, "DBDetector initialize failed."
+
+    # 一些跟DBDetector模型有关的属性封装
+    @property
+    def max_side_len(self):
+        return self._model.max_side_len
+
+    @property
+    def det_db_thresh(self):
+        return self._model.det_db_thresh
+
+    @property
+    def det_db_box_thresh(self):
+        return self._model.det_db_box_thresh
+
+    @property
+    def det_db_unclip_ratio(self):
+        return self._model.det_db_unclip_ratio
+
+    @property
+    def det_db_score_mode(self):
+        return self._model.det_db_score_mode
+
+    @property
+    def use_dilation(self):
+        return self._model.use_dilation
+
+    @property
+    def is_scale(self):
+        return self._model.max_wh
+
+    @max_side_len.setter
+    def max_side_len(self, value):
+        assert isinstance(
+            value, int), "The value to set `max_side_len` must be type of int."
+        self._model.max_side_len = value
+
+    @det_db_thresh.setter
+    def det_db_thresh(self, value):
+        assert isinstance(
+            value,
+            float), "The value to set `det_db_thresh` must be type of float."
+        self._model.det_db_thresh = value
+
+    @det_db_box_thresh.setter
+    def det_db_box_thresh(self, value):
+        assert isinstance(
+            value, float
+        ), "The value to set `det_db_box_thresh` must be type of float."
+        self._model.det_db_box_thresh = value
+
+    @det_db_unclip_ratio.setter
+    def det_db_unclip_ratio(self, value):
+        assert isinstance(
+            value, float
+        ), "The value to set `det_db_unclip_ratio` must be type of float."
+        self._model.det_db_unclip_ratio = value
+
+    @det_db_score_mode.setter
+    def det_db_score_mode(self, value):
+        assert isinstance(
+            value,
+            str), "The value to set `det_db_score_mode` must be type of str."
+        self._model.det_db_score_mode = value
+
+    @use_dilation.setter
+    def use_dilation(self, value):
+        assert isinstance(
+            value,
+            bool), "The value to set `use_dilation` must be type of bool."
+        self._model.use_dilation = value
+
+    @is_scale.setter
+    def is_scale(self, value):
+        assert isinstance(
+            value, bool), "The value to set `is_scale` must be type of bool."
+        self._model.is_scale = value
+
+
+class Classifier(FastDeployModel):
+    def __init__(self,
+                 model_file="",
+                 params_file="",
+                 runtime_option=None,
+                 model_format=Frontend.PADDLE):
+        # 调用基函数进行backend_option的初始化
+        # 初始化后的option保存在self._runtime_option
+        super(Classifier, self).__init__(runtime_option)
+
+        if (len(model_file) == 0):
+            self._model = C.vision.ocr.Classifier()
+        else:
+            self._model = C.vision.ocr.Classifier(
+                model_file, params_file, self._runtime_option, model_format)
+            # 通过self.initialized判断整个模型的初始化是否成功
+            assert self.initialized, "Classifier initialize failed."
+
+    @property
+    def cls_thresh(self):
+        return self._model.cls_thresh
+
+    @property
+    def cls_image_shape(self):
+        return self._model.cls_image_shape
+
+    @property
+    def cls_batch_num(self):
+        return self._model.cls_batch_num
+
+    @cls_thresh.setter
+    def cls_thresh(self, value):
+        assert isinstance(
+            value,
+            float), "The value to set `cls_thresh` must be type of float."
+        self._model.cls_thresh = value
+
+    @cls_image_shape.setter
+    def cls_image_shape(self, value):
+        assert isinstance(
+            value, list), "The value to set `cls_thresh` must be type of list."
+        self._model.cls_image_shape = value
+
+    @cls_batch_num.setter
+    def cls_batch_num(self, value):
+        assert isinstance(
+            value,
+            int), "The value to set `cls_batch_num` must be type of int."
+        self._model.cls_batch_num = value
+
+
+class Recognizer(FastDeployModel):
+    def __init__(self,
+                 model_file="",
+                 params_file="",
+                 label_path="",
+                 runtime_option=None,
+                 model_format=Frontend.PADDLE):
+        # 调用基函数进行backend_option的初始化
+        # 初始化后的option保存在self._runtime_option
+        super(Recognizer, self).__init__(runtime_option)
+
+        if (len(model_file) == 0):
+            self._model = C.vision.ocr.Recognizer()
+        else:
+            self._model = C.vision.ocr.Recognizer(
+                model_file, params_file, label_path, self._runtime_option,
+                model_format)
+            # 通过self.initialized判断整个模型的初始化是否成功
+            assert self.initialized, "Recognizer initialize failed."
+
+    @property
+    def rec_img_h(self):
+        return self._model.rec_img_h
+
+    @property
+    def rec_img_w(self):
+        return self._model.rec_img_w
+
+    @property
+    def rec_batch_num(self):
+        return self._model.rec_batch_num
+
+    @rec_img_h.setter
+    def rec_img_h(self, value):
+        assert isinstance(
+            value, int), "The value to set `rec_img_h` must be type of int."
+        self._model.rec_img_h = value
+
+    @rec_img_w.setter
+    def rec_img_w(self, value):
+        assert isinstance(
+            value, int), "The value to set `rec_img_w` must be type of int."
+        self._model.rec_img_w = value
+
+    @rec_batch_num.setter
+    def rec_batch_num(self, value):
+        assert isinstance(
+            value,
+            int), "The value to set `rec_batch_num` must be type of int."
+        self._model.rec_batch_num = value
+
+
+class PPOCRSystemv3(FastDeployModel):
+    def __init__(self, ocr_det=None, ocr_cls=None, ocr_rec=None):
+
+        self._model = C.vision.ocr.PPOCRSystemv3(ocr_det, ocr_cls, ocr_rec)
+
+    def predict(self, input_image):
+        return self._model.predict(input_image)
+
+
+class PPOCRSystemv2(FastDeployModel):
+    def __init__(self, ocr_det=None, ocr_cls=None, ocr_rec=None):
+
+        self._model = C.vision.ocr.PPOCRSystemv2(ocr_det, ocr_cls, ocr_rec)
+
+    def predict(self, input_image):
+        return self._model.predict(input_image)

fastdeploy/vision/visualize/__init__.py

@@ -40,3 +40,7 @@ def vis_matting_alpha(im_data,
                       remove_small_connected_area=False):
     return C.vision.Visualize.vis_matting_alpha(im_data, matting_result,
                                                 remove_small_connected_area)
+
+
+def vis_ppocr(im_data, det_result):
+    return C.vision.Visualize.vis_ppocr(im_data, det_result)