π Awesome OCR multiple programing languages toolkits based on ONNX Runtime, OpenVINO, MNN, PaddlePaddle, TensorRT and PyTorch.
chore(rapidocr_onnxruntime): Optim tips
SWHLa291ca1dcb90
diff --git a/python/rapidocr_onnxruntime/utils/infer_engine.py b/python/rapidocr_onnxruntime/utils/infer_engine.pyindex 51ee123..41c2666 100644--- a/python/rapidocr_onnxruntime/utils/infer_engine.py+++ b/python/rapidocr_onnxruntime/utils/infer_engine.py@@ -4,6 +4,7 @@import osimport platformimport traceback+from enum import Enumfrom pathlib import Pathfrom typing import List, Tuple, Union@@ -18,9 +19,11 @@ from onnxruntime import (from .logger import get_logger-CPU_EP = "CPUExecutionProvider"-CUDA_EP = "CUDAExecutionProvider"-DIRECTML_EP = "DmlExecutionProvider"++class EP(Enum):+ CPU_EP = "CPUExecutionProvider"+ CUDA_EP = "CUDAExecutionProvider"+ DIRECTML_EP = "DmlExecutionProvider"class OrtInferSession:@@ -64,7 +67,7 @@ class OrtInferSession:cpu_provider_opts = {"arena_extend_strategy": "kSameAsRequested",}- EP_list = [(CPU_EP, cpu_provider_opts)]+ EP_list = [(EP.CPU_EP, cpu_provider_opts)]cuda_provider_opts = {"device_id": 0,@@ -74,7 +77,7 @@ class OrtInferSession:}self.use_cuda = self._check_cuda()if self.use_cuda:- EP_list.insert(0, (CUDA_EP, cuda_provider_opts))+ EP_list.insert(0, (EP.CUDA_EP, cuda_provider_opts))self.use_directml = self._check_dml()if self.use_directml:@@ -84,7 +87,7 @@ class OrtInferSession:directml_options = (cuda_provider_opts if self.use_cuda else cpu_provider_opts)- EP_list.insert(0, (DIRECTML_EP, directml_options))+ EP_list.insert(0, (EP.DIRECTML_EP, directml_options))return EP_listdef _check_cuda(self) -> bool:@@ -92,16 +95,19 @@ class OrtInferSession:return Falsecur_device = get_device()- if cur_device == "GPU" and CUDA_EP in self.had_providers:+ if cur_device == "GPU" and EP.CUDA_EP in self.had_providers:return Trueself.logger.warning("%s is not in available providers (%s). Use %s inference by default.",- CUDA_EP,+ EP.CUDA_EP,self.had_providers,self.had_providers[0],)- self.logger.info("If you want to use GPU acceleration, you must do:")+ self.logger.info("!!!Recommend to use rapidocr_paddle for inference on GPU.")+ self.logger.info(+ "(For reference only) If you want to use GPU acceleration, you must do:"+ )self.logger.info("First, uninstall all onnxruntime pakcages in current environment.")@@ -112,11 +118,11 @@ class OrtInferSession:"\tNote the onnxruntime-gpu version must match your cuda and cudnn version.")self.logger.info(- "\tYou can refer this link: https://onnxruntime.ai/docs/execution-providers/CUDA-ExecutionProvider.html"+ "\tYou can refer this link: https://onnxruntime.ai/docs/execution-providers/CUDA-EP.html")self.logger.info("Third, ensure %s is in available providers list. e.g. ['CUDAExecutionProvider', 'CPUExecutionProvider']",- CUDA_EP,+ EP.CUDA_EP,)return False@@ -142,12 +148,12 @@ class OrtInferSession:)return False- if DIRECTML_EP in self.had_providers:+ if EP.DIRECTML_EP in self.had_providers:return Trueself.logger.warning("%s is not in available providers (%s). Use %s inference by default.",- DIRECTML_EP,+ EP.DIRECTML_EP,self.had_providers,self.had_providers[0],)@@ -160,7 +166,7 @@ class OrtInferSession:)self.logger.info("Third, ensure %s is in available providers list. e.g. ['DmlExecutionProvider', 'CPUExecutionProvider']",- DIRECTML_EP,+ EP.DIRECTML_EP,)return False@@ -168,17 +174,17 @@ class OrtInferSession:session_providers = self.session.get_providers()first_provider = session_providers[0]- if self.use_cuda and first_provider != CUDA_EP:+ if self.use_cuda and first_provider != EP.CUDA_EP:self.logger.warning("%s is not avaiable for current env, the inference part is automatically shifted to be executed under %s.",- CUDA_EP,+ EP.CUDA_EP,first_provider,)- if self.use_directml and first_provider != DIRECTML_EP:+ if self.use_directml and first_provider != EP.DIRECTML_EP:self.logger.warning("%s is not available for current env, the inference part is automatically shifted to be executed under %s.",- DIRECTML_EP,+ EP.DIRECTML_EP,first_provider,)diff --git a/python/rapidocr_onnxruntime/utils/parse_parameters.py b/python/rapidocr_onnxruntime/utils/parse_parameters.pyindex df6a5d3..4c4b3f5 100644--- a/python/rapidocr_onnxruntime/utils/parse_parameters.py+++ b/python/rapidocr_onnxruntime/utils/parse_parameters.py@@ -40,18 +40,8 @@ def init_args():global_group.add_argument("--inter_op_num_threads", type=int, default=-1)det_group = parser.add_argument_group(title="Det")- det_group.add_argument(- "--det_use_cuda",- action="store_true",- default=False,- help="Whether to use cuda. The prerequisite is: first uninstall all onnxruntime packages and install only the onnxruntime-gpu library.",- )- det_group.add_argument(- "--det_use_dml",- action="store_true",- default=False,- help="Whether to use DirectML. The prerequisite is: the operating system is Windows 10+. First uninstall all onnxruntime packages and install only the onnxruntime-directml library.",- )+ det_group.add_argument("--det_use_cuda", action="store_true", default=False)+ det_group.add_argument("--det_use_dml", action="store_true", default=False)det_group.add_argument("--det_model_path", type=str, default=None)det_group.add_argument("--det_limit_side_len", type=float, default=736)det_group.add_argument(@@ -68,18 +58,8 @@ def init_args():)cls_group = parser.add_argument_group(title="Cls")- cls_group.add_argument(- "--cls_use_cuda",- action="store_true",- default=False,- help="Whether to use cuda. The prerequisite is: first uninstall all onnxruntime packages and install only the onnxruntime-gpu library.",- )- cls_group.add_argument(- "--cls_use_dml",- action="store_true",- default=False,- help="Whether to use DirectML. The prerequisite is: the operating system is Windows 10+. First uninstall all onnxruntime packages and install only the onnxruntime-directml library.",- )+ cls_group.add_argument("--cls_use_cuda", action="store_true", default=False)+ cls_group.add_argument("--cls_use_dml", action="store_true", default=False)cls_group.add_argument("--cls_model_path", type=str, default=None)cls_group.add_argument("--cls_image_shape", type=list, default=[3, 48, 192])cls_group.add_argument("--cls_label_list", type=list, default=["0", "180"])@@ -87,18 +67,8 @@ def init_args():cls_group.add_argument("--cls_thresh", type=float, default=0.9)rec_group = parser.add_argument_group(title="Rec")- rec_group.add_argument(- "--rec_use_cuda",- action="store_true",- default=False,- help="Whether to use cuda. The prerequisite is: first uninstall all onnxruntime packages and install only the onnxruntime-gpu library.",- )- rec_group.add_argument(- "--rec_use_dml",- action="store_true",- default=False,- help="Whether to use DirectML. The prerequisite is: the operating system is Windows 10+. First uninstall all onnxruntime packages and install only the onnxruntime-directml library.",- )+ rec_group.add_argument("--rec_use_cuda", action="store_true", default=False)+ rec_group.add_argument("--rec_use_dml", action="store_true", default=False)rec_group.add_argument("--rec_model_path", type=str, default=None)rec_group.add_argument("--rec_keys_path", type=str, default=None)rec_group.add_argument("--rec_img_shape", type=list, default=[3, 48, 320])