From a87ecab2d3243ea2596acca091d7e54171ea2ce8 Mon Sep 17 00:00:00 2001 From: SWHL Date: Fri, 25 Apr 2025 20:53:05 +0800 Subject: [PATCH] fix(rapidocr): fixed path error of infernce engine when customizing incoming parameters --- python/rapidocr/inference_engine/base.py | 2 -- python/rapidocr/inference_engine/onnxruntime.py | 2 +- python/rapidocr/inference_engine/openvino.py | 2 +- python/rapidocr/inference_engine/paddle.py | 2 +- python/rapidocr/inference_engine/torch.py | 4 ++-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/python/rapidocr/inference_engine/base.py b/python/rapidocr/inference_engine/base.py index bb14919..8e161a7 100644 --- a/python/rapidocr/inference_engine/base.py +++ b/python/rapidocr/inference_engine/base.py @@ -121,8 +121,6 @@ class InferSession(abc.ABC): if not model_path.is_file(): raise FileExistsError(f"{model_path} is not a file.") - return model_path - @abc.abstractmethod def have_key(self, key: str = "character") -> bool: pass diff --git a/python/rapidocr/inference_engine/onnxruntime.py b/python/rapidocr/inference_engine/onnxruntime.py index 11fb040..6257b22 100644 --- a/python/rapidocr/inference_engine/onnxruntime.py +++ b/python/rapidocr/inference_engine/onnxruntime.py @@ -32,7 +32,7 @@ class OrtInferSession(InferSession): def __init__(self, config: Dict[str, Any]): self.logger = Logger(logger_name=__name__).get_log() - model_path = config.get("model_path", None) + model_path = Path(config.get("model_path", None)) if model_path is None: # 说明用户没有指定自己模型,使用默认模型 model_info = self.get_model_url( diff --git a/python/rapidocr/inference_engine/openvino.py b/python/rapidocr/inference_engine/openvino.py index ad114b4..8f15379 100644 --- a/python/rapidocr/inference_engine/openvino.py +++ b/python/rapidocr/inference_engine/openvino.py @@ -21,7 +21,7 @@ class OpenVINOInferSession(InferSession): core = Core() - model_path = config.get("model_path", None) + model_path = Path(config.get("model_path", None)) if model_path is None: model_info = self.get_model_url( config.engine_name, config.task_type, config.lang diff --git a/python/rapidocr/inference_engine/paddle.py b/python/rapidocr/inference_engine/paddle.py index e7a257f..a0b6c25 100644 --- a/python/rapidocr/inference_engine/paddle.py +++ b/python/rapidocr/inference_engine/paddle.py @@ -24,7 +24,7 @@ class PaddleInferSession(InferSession): self.logger = Logger(logger_name=__name__).get_log() self.mode = mode - model_dir = config.get("model_dir", None) + model_dir = Path(config.get("model_dir", None)) if model_dir is None: model_info = self.get_model_url( config.engine_name, config.task_type, config.lang diff --git a/python/rapidocr/inference_engine/torch.py b/python/rapidocr/inference_engine/torch.py index 2e69293..d0dc179 100644 --- a/python/rapidocr/inference_engine/torch.py +++ b/python/rapidocr/inference_engine/torch.py @@ -20,7 +20,7 @@ class TorchInferSession(InferSession): def __init__(self, config) -> None: self.logger = Logger(logger_name=__name__).get_log() - model_path = config.get("model_path", None) + model_path = Path(config.get("model_path", None)) if model_path is None: model_info = self.get_model_url( config.engine_name, config.task_type, config.lang @@ -36,7 +36,7 @@ class TorchInferSession(InferSession): ) ) - model_path = self._verify_model(model_path) + self._verify_model(model_path) all_arch_config = OmegaConf.load(DEFAULT_CFG_PATH) file_name = model_path.stem