chore: Optimize code structure

RapidAI · Sep 6, 2024 · 6b60256 · 6b60256
1 parent 034e7f5
commit 6b60256
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 115 deletions.
diff --git a/...r_onnxruntime/ch_ppocr_v2_cls/__init__.py → ...docr_onnxruntime/ch_ppocr_cls/__init__.py b/...r_onnxruntime/ch_ppocr_v2_cls/__init__.py → ...docr_onnxruntime/ch_ppocr_cls/__init__.py
diff --git a/...r_onnxruntime/ch_ppocr_v2_cls/text_cls.py → ...docr_onnxruntime/ch_ppocr_cls/text_cls.py b/...r_onnxruntime/ch_ppocr_v2_cls/text_cls.py → ...docr_onnxruntime/ch_ppocr_cls/text_cls.py
diff --git a/...docr_onnxruntime/ch_ppocr_v2_cls/utils.py → ...apidocr_onnxruntime/ch_ppocr_cls/utils.py b/...docr_onnxruntime/ch_ppocr_v2_cls/utils.py → ...apidocr_onnxruntime/ch_ppocr_cls/utils.py
diff --git a/...r_onnxruntime/ch_ppocr_v3_det/__init__.py → ...docr_onnxruntime/ch_ppocr_det/__init__.py b/...r_onnxruntime/ch_ppocr_v3_det/__init__.py → ...docr_onnxruntime/ch_ppocr_det/__init__.py
diff --git a/...nnxruntime/ch_ppocr_v3_det/text_detect.py → ...r_onnxruntime/ch_ppocr_det/text_detect.py b/...nnxruntime/ch_ppocr_v3_det/text_detect.py → ...r_onnxruntime/ch_ppocr_det/text_detect.py
diff --git a/...docr_onnxruntime/ch_ppocr_v3_det/utils.py → ...apidocr_onnxruntime/ch_ppocr_det/utils.py b/...docr_onnxruntime/ch_ppocr_v3_det/utils.py → ...apidocr_onnxruntime/ch_ppocr_det/utils.py
diff --git a/...r_onnxruntime/ch_ppocr_v3_rec/__init__.py → ...docr_onnxruntime/ch_ppocr_rec/__init__.py b/...r_onnxruntime/ch_ppocr_v3_rec/__init__.py → ...docr_onnxruntime/ch_ppocr_rec/__init__.py
diff --git a/...runtime/ch_ppocr_v3_rec/text_recognize.py → ...nnxruntime/ch_ppocr_rec/text_recognize.py b/...runtime/ch_ppocr_v3_rec/text_recognize.py → ...nnxruntime/ch_ppocr_rec/text_recognize.py
diff --git a/...docr_onnxruntime/ch_ppocr_v3_rec/utils.py → ...apidocr_onnxruntime/ch_ppocr_rec/utils.py b/...docr_onnxruntime/ch_ppocr_v3_rec/utils.py → ...apidocr_onnxruntime/ch_ppocr_rec/utils.py
diff --git a/python/rapidocr_onnxruntime/ch_ppocr_v2_cls/config.yaml b/python/rapidocr_onnxruntime/ch_ppocr_v2_cls/config.yaml
diff --git a/python/rapidocr_onnxruntime/ch_ppocr_v3_det/config.yaml b/python/rapidocr_onnxruntime/ch_ppocr_v3_det/config.yaml
diff --git a/python/rapidocr_onnxruntime/ch_ppocr_v3_rec/config.yaml b/python/rapidocr_onnxruntime/ch_ppocr_v3_rec/config.yaml
diff --git a/python/rapidocr_onnxruntime/main.py b/python/rapidocr_onnxruntime/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_ort.py b/python/tests/test_ort.py
@@ -8,7 +8,6 @@
 import cv2
 import numpy as np
 import pytest
-from base_module import BaseModule
 
 root_dir = Path(__file__).resolve().parent.parent
 sys.path.append(str(root_dir))
@@ -208,59 +207,3 @@ def test_input_three_ndim_one_channel():
 
     assert result[0][1] == "正品促销"
     assert len(result) == 17
-
-
-def test_det():
-    module_name = "ch_ppocr_v3_det"
-    class_name = "TextDetector"
-
-    base = BaseModule(package_name)
-    TextDetector = base.init_module(module_name, class_name)
-
-    yaml_path = base.package_dir / module_name / "config.yaml"
-    config = base.read_yaml(str(yaml_path))
-    config["model_path"] = str(base.package_dir / config["model_path"])
-
-    text_det = TextDetector(config)
-    img_path = base.tests_dir / "test_files" / "text_det.jpg"
-    img = cv2.imread(str(img_path))
-    dt_boxes, elapse = text_det(img)
-    assert dt_boxes.shape == (18, 4, 2)
-
-
-def test_cls():
-    module_name = "ch_ppocr_v2_cls"
-    class_name = "TextClassifier"
-
-    base = BaseModule(package_name=package_name)
-    TextClassifier = base.init_module(module_name, class_name)
-
-    yaml_path = base.package_dir / module_name / "config.yaml"
-    config = base.read_yaml(str(yaml_path))
-    config["model_path"] = str(base.package_dir / config["model_path"])
-
-    text_cls = TextClassifier(config)
-
-    img_path = base.tests_dir / "test_files" / "text_cls.jpg"
-    img = cv2.imread(str(img_path))
-    result = text_cls([img])
-    assert result[1][0][0] == "180"
-
-
-def test_rec():
-    module_name = "ch_ppocr_v3_rec"
-    class_name = "TextRecognizer"
-
-    base = BaseModule(package_name)
-    TextRecognizer = base.init_module(module_name, class_name)
-
-    yaml_path = base.package_dir / module_name / "config.yaml"
-    config = base.read_yaml(str(yaml_path))
-    config["model_path"] = str(base.package_dir / config["model_path"])
-
-    text_rec = TextRecognizer(config)
-
-    img_path = base.tests_dir / "test_files" / "text_rec.jpg"
-    img = cv2.imread(str(img_path))
-    rec_res, elapse = text_rec(img)
-    assert rec_res[0][0] == "韩国小馆"