From bdd77a6d21eb55c4337687614ad8724491727d4e Mon Sep 17 00:00:00 2001 From: jamjamjon <505024985@qq.com> Date: Sat, 25 Jan 2025 01:53:13 +0800 Subject: [PATCH] Add svtr_en model --- examples/svtr/main.rs | 1 + src/models/svtr/config.rs | 31 +++++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/examples/svtr/main.rs b/examples/svtr/main.rs index 12619e7..d53a2ef 100644 --- a/examples/svtr/main.rs +++ b/examples/svtr/main.rs @@ -23,6 +23,7 @@ fn main() -> Result<()> { // build model let options = Options::ppocr_rec_v4_ch() + // ppocr_rec_v4_en() // repsvtr_ch() .with_model_device(args.device.as_str().try_into()?) .with_model_dtype(args.dtype.as_str().try_into()?) diff --git a/src/models/svtr/config.rs b/src/models/svtr/config.rs index 3d82fa3..8f0c06e 100644 --- a/src/models/svtr/config.rs +++ b/src/models/svtr/config.rs @@ -11,34 +11,49 @@ impl crate::Options { .with_padding_value(0) .with_normalize(true) .with_class_confs(&[0.2]) - .with_vocab_txt("vocab-v1-ppocr-rec-ch.txt") + } + + pub fn svtr_ch() -> Self { + Self::svtr().with_vocab_txt("vocab-v1-ppocr-rec-ch.txt") + } + + pub fn svtr_en() -> Self { + Self::svtr().with_vocab_txt("vocab-v1-ppocr-rec-en.txt") } pub fn ppocr_rec_v3_ch() -> Self { - Self::svtr().with_model_file("ppocr-v3-ch.onnx") + Self::svtr_ch().with_model_file("ppocr-v3-ch.onnx") } pub fn ppocr_rec_v4_ch() -> Self { - Self::svtr().with_model_file("ppocr-v4-ch.onnx") + Self::svtr_ch().with_model_file("ppocr-v4-ch.onnx") + } + + pub fn ppocr_rec_v3_en() -> Self { + Self::svtr_en().with_model_file("ppocr-v3-en.onnx") + } + + pub fn ppocr_rec_v4_en() -> Self { + Self::svtr_en().with_model_file("ppocr-v4-en.onnx") } pub fn ppocr_rec_v4_server_ch() -> Self { - Self::svtr().with_model_file("ppocr-v4-server-ch.onnx") + Self::svtr_ch().with_model_file("ppocr-v4-server-ch.onnx") } pub fn svtr_v2_server_ch() -> Self { - Self::svtr().with_model_file("v2-server-ch.onnx") + Self::svtr_ch().with_model_file("v2-server-ch.onnx") } pub fn repsvtr_ch() -> Self { - Self::svtr().with_model_file("repsvtr-ch.onnx") + Self::svtr_ch().with_model_file("repsvtr-ch.onnx") } pub fn svtr_v2_teacher_ch() -> Self { - Self::svtr().with_model_file("v2-distill-teacher-ch.onnx") + Self::svtr_ch().with_model_file("v2-distill-teacher-ch.onnx") } pub fn svtr_v2_student_ch() -> Self { - Self::svtr().with_model_file("v2-distill-student-ch.onnx") + Self::svtr_ch().with_model_file("v2-distill-student-ch.onnx") } }