chore(rapidocr_openvino/paddle): Optim code

RapidAI · Sep 19, 2024 · 81cea70 · 81cea70
1 parent 64da0dd
commit 81cea70
Show file tree

Hide file tree

Showing 30 changed files with 12 additions and 12 deletions.
diff --git a/...docr_openvino/ch_ppocr_v2_cls/__init__.py → ...apidocr_openvino/ch_ppocr_cls/__init__.py b/...docr_openvino/ch_ppocr_v2_cls/__init__.py → ...apidocr_openvino/ch_ppocr_cls/__init__.py
diff --git a/...docr_openvino/ch_ppocr_v2_cls/config.yaml → ...apidocr_openvino/ch_ppocr_cls/config.yaml b/...docr_openvino/ch_ppocr_v2_cls/config.yaml → ...apidocr_openvino/ch_ppocr_cls/config.yaml
diff --git a/...docr_openvino/ch_ppocr_v2_cls/text_cls.py → ...apidocr_openvino/ch_ppocr_cls/text_cls.py b/...docr_openvino/ch_ppocr_v2_cls/text_cls.py → ...apidocr_openvino/ch_ppocr_cls/text_cls.py
diff --git a/...apidocr_openvino/ch_ppocr_v2_cls/utils.py → ...n/rapidocr_openvino/ch_ppocr_cls/utils.py b/...apidocr_openvino/ch_ppocr_v2_cls/utils.py → ...n/rapidocr_openvino/ch_ppocr_cls/utils.py
diff --git a/...docr_openvino/ch_ppocr_v3_det/__init__.py → ...apidocr_openvino/ch_ppocr_det/__init__.py b/...docr_openvino/ch_ppocr_v3_det/__init__.py → ...apidocr_openvino/ch_ppocr_det/__init__.py
diff --git a/...docr_openvino/ch_ppocr_v3_det/config.yaml → ...apidocr_openvino/ch_ppocr_det/config.yaml b/...docr_openvino/ch_ppocr_v3_det/config.yaml → ...apidocr_openvino/ch_ppocr_det/config.yaml
diff --git a/...r_openvino/ch_ppocr_v3_det/text_detect.py → ...docr_openvino/ch_ppocr_det/text_detect.py b/...r_openvino/ch_ppocr_v3_det/text_detect.py → ...docr_openvino/ch_ppocr_det/text_detect.py
diff --git a/...apidocr_openvino/ch_ppocr_v3_det/utils.py → ...n/rapidocr_openvino/ch_ppocr_det/utils.py b/...apidocr_openvino/ch_ppocr_v3_det/utils.py → ...n/rapidocr_openvino/ch_ppocr_det/utils.py
diff --git a/...docr_openvino/ch_ppocr_v3_rec/__init__.py → ...apidocr_openvino/ch_ppocr_rec/__init__.py b/...docr_openvino/ch_ppocr_v3_rec/__init__.py → ...apidocr_openvino/ch_ppocr_rec/__init__.py
diff --git a/...docr_openvino/ch_ppocr_v3_rec/config.yaml → ...apidocr_openvino/ch_ppocr_rec/config.yaml b/...docr_openvino/ch_ppocr_v3_rec/config.yaml → ...apidocr_openvino/ch_ppocr_rec/config.yaml
diff --git a/...penvino/ch_ppocr_v3_rec/ppocr_keys_v1.txt → ...r_openvino/ch_ppocr_rec/ppocr_keys_v1.txt b/...penvino/ch_ppocr_v3_rec/ppocr_keys_v1.txt → ...r_openvino/ch_ppocr_rec/ppocr_keys_v1.txt
diff --git a/...penvino/ch_ppocr_v3_rec/text_recognize.py → ...r_openvino/ch_ppocr_rec/text_recognize.py b/...penvino/ch_ppocr_v3_rec/text_recognize.py → ...r_openvino/ch_ppocr_rec/text_recognize.py
diff --git a/...apidocr_openvino/ch_ppocr_v3_rec/utils.py → ...n/rapidocr_openvino/ch_ppocr_rec/utils.py b/...apidocr_openvino/ch_ppocr_v3_rec/utils.py → ...n/rapidocr_openvino/ch_ppocr_rec/utils.py
diff --git a/python/rapidocr_openvino/main.py b/python/rapidocr_openvino/main.py
@@ -8,9 +8,9 @@
 import cv2
 import numpy as np
 
-from .ch_ppocr_v2_cls import TextClassifier
-from .ch_ppocr_v3_det import TextDetector
-from .ch_ppocr_v3_rec import TextRecognizer
+from .ch_ppocr_cls import TextClassifier
+from .ch_ppocr_det import TextDetector
+from .ch_ppocr_rec import TextRecognizer
 from .utils import (
     LoadImage,
     UpdateParameters,

diff --git a/...pidocr_paddle/ch_ppocr_v2_cls/__init__.py → .../rapidocr_paddle/ch_ppocr_cls/__init__.py b/...pidocr_paddle/ch_ppocr_v2_cls/__init__.py → .../rapidocr_paddle/ch_ppocr_cls/__init__.py
diff --git a/...pidocr_paddle/ch_ppocr_v2_cls/config.yaml → .../rapidocr_paddle/ch_ppocr_cls/config.yaml b/...pidocr_paddle/ch_ppocr_v2_cls/config.yaml → .../rapidocr_paddle/ch_ppocr_cls/config.yaml
diff --git a/...pidocr_paddle/ch_ppocr_v2_cls/text_cls.py → .../rapidocr_paddle/ch_ppocr_cls/text_cls.py b/...pidocr_paddle/ch_ppocr_v2_cls/text_cls.py → .../rapidocr_paddle/ch_ppocr_cls/text_cls.py
diff --git a/.../rapidocr_paddle/ch_ppocr_v2_cls/utils.py → python/rapidocr_paddle/ch_ppocr_cls/utils.py b/.../rapidocr_paddle/ch_ppocr_v2_cls/utils.py → python/rapidocr_paddle/ch_ppocr_cls/utils.py
diff --git a/...pidocr_paddle/ch_ppocr_v3_det/__init__.py → .../rapidocr_paddle/ch_ppocr_det/__init__.py b/...pidocr_paddle/ch_ppocr_v3_det/__init__.py → .../rapidocr_paddle/ch_ppocr_det/__init__.py
diff --git a/...pidocr_paddle/ch_ppocr_v3_det/config.yaml → .../rapidocr_paddle/ch_ppocr_det/config.yaml b/...pidocr_paddle/ch_ppocr_v3_det/config.yaml → .../rapidocr_paddle/ch_ppocr_det/config.yaml
diff --git a/...ocr_paddle/ch_ppocr_v3_det/text_detect.py → ...pidocr_paddle/ch_ppocr_det/text_detect.py b/...ocr_paddle/ch_ppocr_v3_det/text_detect.py → ...pidocr_paddle/ch_ppocr_det/text_detect.py
diff --git a/.../rapidocr_paddle/ch_ppocr_v3_det/utils.py → python/rapidocr_paddle/ch_ppocr_det/utils.py b/.../rapidocr_paddle/ch_ppocr_v3_det/utils.py → python/rapidocr_paddle/ch_ppocr_det/utils.py
diff --git a/...pidocr_paddle/ch_ppocr_v3_rec/__init__.py → .../rapidocr_paddle/ch_ppocr_rec/__init__.py b/...pidocr_paddle/ch_ppocr_v3_rec/__init__.py → .../rapidocr_paddle/ch_ppocr_rec/__init__.py
diff --git a/...pidocr_paddle/ch_ppocr_v3_rec/config.yaml → .../rapidocr_paddle/ch_ppocr_rec/config.yaml b/...pidocr_paddle/ch_ppocr_v3_rec/config.yaml → .../rapidocr_paddle/ch_ppocr_rec/config.yaml
diff --git a/..._paddle/ch_ppocr_v3_rec/ppocr_keys_v1.txt → ...ocr_paddle/ch_ppocr_rec/ppocr_keys_v1.txt b/..._paddle/ch_ppocr_v3_rec/ppocr_keys_v1.txt → ...ocr_paddle/ch_ppocr_rec/ppocr_keys_v1.txt
diff --git a/..._paddle/ch_ppocr_v3_rec/text_recognize.py → ...ocr_paddle/ch_ppocr_rec/text_recognize.py b/..._paddle/ch_ppocr_v3_rec/text_recognize.py → ...ocr_paddle/ch_ppocr_rec/text_recognize.py
diff --git a/.../rapidocr_paddle/ch_ppocr_v3_rec/utils.py → python/rapidocr_paddle/ch_ppocr_rec/utils.py b/.../rapidocr_paddle/ch_ppocr_v3_rec/utils.py → python/rapidocr_paddle/ch_ppocr_rec/utils.py
diff --git a/python/rapidocr_paddle/main.py b/python/rapidocr_paddle/main.py
@@ -8,9 +8,9 @@
 import cv2
 import numpy as np
 
-from .ch_ppocr_v2_cls import TextClassifier
-from .ch_ppocr_v3_det import TextDetector
-from .ch_ppocr_v3_rec import TextRecognizer
+from .ch_ppocr_cls import TextClassifier
+from .ch_ppocr_det import TextDetector
+from .ch_ppocr_rec import TextRecognizer
 from .utils import (
     LoadImage,
     UpdateParameters,

diff --git a/python/tests/test_paddle.py b/python/tests/test_paddle.py
@@ -194,7 +194,7 @@ def test_input_three_ndim_one_channel():
 
 
 def test_det():
-    module_name = "ch_ppocr_v3_det"
+    module_name = "ch_ppocr_det"
     class_name = "TextDetector"
 
     base = BaseModule(package_name)
@@ -212,7 +212,7 @@ def test_det():
 
 
 def test_cls():
-    module_name = "ch_ppocr_v2_cls"
+    module_name = "ch_ppocr_cls"
     class_name = "TextClassifier"
 
     base = BaseModule(package_name=package_name)
@@ -231,7 +231,7 @@ def test_cls():
 
 
 def test_rec():
-    module_name = "ch_ppocr_v3_rec"
+    module_name = "ch_ppocr_rec"
     class_name = "TextRecognizer"
 
     base = BaseModule(package_name)

diff --git a/python/tests/test_vino.py b/python/tests/test_vino.py
@@ -194,7 +194,7 @@ def test_input_three_ndim_one_channel():
 
 
 def test_det():
-    module_name = "ch_ppocr_v3_det"
+    module_name = "ch_ppocr_det"
     class_name = "TextDetector"
 
     base = BaseModule(package_name)
@@ -212,7 +212,7 @@ def test_det():
 
 
 def test_cls():
-    module_name = "ch_ppocr_v2_cls"
+    module_name = "ch_ppocr_cls"
     class_name = "TextClassifier"
 
     base = BaseModule(package_name=package_name)
@@ -231,7 +231,7 @@ def test_cls():
 
 
 def test_rec():
-    module_name = "ch_ppocr_v3_rec"
+    module_name = "ch_ppocr_rec"
     class_name = "TextRecognizer"
 
     base = BaseModule(package_name)