refactor: rename files and update import paths for consistency

mineru/model/mfr/pp_formulanet_plus_m/predict_formula.py

@@ -3,8 +3,8 @@ import torch
 import yaml
 from pathlib import Path
 from tqdm import tqdm
-from mineru.model.ocr.paddleocr2pytorch.tools.infer import pytorchocr_utility
-from mineru.model.ocr.paddleocr2pytorch.pytorchocr.base_ocr_v20 import BaseOCRV20
+from mineru.model.utils.tools.infer import pytorchocr_utility
+from mineru.model.utils.pytorchocr.base_ocr_v20 import BaseOCRV20
 from .processors import (
     UniMERNetImgDecode,
     UniMERNetTestTransform,
@@ -24,7 +24,14 @@ class FormulaRecognizer(BaseOCRV20):
             weight_dir,
             "PP-FormulaNet_plus-M.pth",
         )
-        self.yaml_path = Path(__file__).parent / "config" / "arch_config.yaml"
+        self.yaml_path = os.path.join(
+            Path(__file__).parent.parent.parent,
+            "utils",
+            "pytorchocr",
+            "utils",
+            "resources",
+            "pp_formulanet_arch_config.yaml"
+        )
         self.infer_yaml_path = os.path.join(
             weight_dir,
             "PP-FormulaNet_plus-M_inference.yml",
@@ -38,6 +45,7 @@ class FormulaRecognizer(BaseOCRV20):
         super(FormulaRecognizer, self).__init__(network_config)
 
         self.load_state_dict(weights)
+        # device = "cpu"
         self.device = torch.device(device) if isinstance(device, str) else device
         self.net.to(self.device)
         self.net.eval()

mineru/model/ocr/paddleocr2pytorch/pytorch_paddle.py

@@ -13,8 +13,8 @@ from mineru.utils.config_reader import get_device
 from mineru.utils.enum_class import ModelPath
 from mineru.utils.models_download_utils import auto_download_and_get_model_root_path
 from mineru.utils.ocr_utils import check_img, preprocess_image, sorted_boxes, merge_det_boxes, update_det_boxes, get_rotate_crop_image
-from mineru.model.ocr.paddleocr2pytorch.tools.infer.predict_system import TextSystem
-from mineru.model.ocr.paddleocr2pytorch.tools.infer import pytorchocr_utility as utility
+from mineru.model.utils.tools.infer.predict_system import TextSystem
+from mineru.model.utils.tools.infer import pytorchocr_utility as utility
 import argparse
 
 
@@ -47,7 +47,7 @@ def get_model_params(lang, config):
         raise Exception (f'Language {lang} not supported')
 
 
-root_dir = Path(__file__).resolve().parent
+root_dir = os.path.join(Path(__file__).resolve().parent.parent.parent, 'utils')
 
 
 class PytorchPaddleOCR(TextSystem):

mineru/model/utils/tools/infer/__init__.py

@@ -0,0 +1 @@
+# Copyright (c) Opendatalab. All rights reserved.