Skip to content

πŸ“„ Awesome OCR multiple programing languages toolkits based on ONNX Runtime, OpenVINO, MNN, PaddlePaddle, TensorRT and PyTorch.

Add support for RapidOCR class init to specify the number of threads.

SWHLf3732c102e8b
diff --git a/python/rapidocr_onnxruntime/config.yaml b/python/rapidocr_onnxruntime/config.yaml
index 3fa09e1..a8da9cc 100644
--- a/python/rapidocr_onnxruntime/config.yaml
+++ b/python/rapidocr_onnxruntime/config.yaml
@@ -7,8 +7,6 @@ Global:
min_height: 30
width_height_ratio: 8
- use_cuda: &use_cuda false
-
intra_op_num_threads: &intra_nums -1
inter_op_num_threads: &inter_nums -1
@@ -16,7 +14,7 @@ Det:
intra_op_num_threads: *intra_nums
inter_op_num_threads: *inter_nums
- use_cuda: *use_cuda
+ use_cuda: false
model_path: models/ch_PP-OCRv4_det_infer.onnx
@@ -34,7 +32,7 @@ Cls:
intra_op_num_threads: *intra_nums
inter_op_num_threads: *inter_nums
- use_cuda: *use_cuda
+ use_cuda: false
model_path: models/ch_ppocr_mobile_v2.0_cls_infer.onnx
@@ -47,7 +45,7 @@ Rec:
intra_op_num_threads: *intra_nums
inter_op_num_threads: *inter_nums
- use_cuda: *use_cuda
+ use_cuda: false
model_path: models/ch_PP-OCRv4_rec_infer.onnx
diff --git a/python/rapidocr_onnxruntime/utils.py b/python/rapidocr_onnxruntime/utils.py
index 181dd91..6bd46f4 100644
--- a/python/rapidocr_onnxruntime/utils.py
+++ b/python/rapidocr_onnxruntime/utils.py
@@ -256,6 +256,9 @@ def init_args():
global_group.add_argument("--min_height", type=int, default=30)
global_group.add_argument("--width_height_ratio", type=int, default=8)
+ global_group.add_argument("--intra_op_num_threads", type=int, default=-1)
+ 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)
det_group.add_argument("--det_model_path", type=str, default=None)
@@ -344,8 +347,21 @@ class UpdateParameters:
config["Rec"], rec_dict, "rec_", ["rec_model_path", "rec_use_cuda"]
),
}
+
+ update_params = ["intra_op_num_threads", "inter_op_num_threads"]
+ new_config = self.update_global_to_module(
+ config, update_params, src="Global", dsts=["Det", "Cls", "Rec"]
+ )
return new_config
+ def update_global_to_module(
+ self, config, params: List[str], src: str, dsts: List[str]
+ ):
+ for dst in dsts:
+ for param in params:
+ config[dst].update({param: config[src][param]})
+ return config
+
def update_global_params(self, config, global_dict):
if global_dict:
config.update(global_dict)