From d513c1ceb75a212095609ec7b47a77b56dfd22b1 Mon Sep 17 00:00:00 2001 From: yunyaoXYY <109218879+yunyaoXYY@users.noreply.github.com> Date: Tue, 20 Sep 2022 15:44:32 +0800 Subject: [PATCH] Add PaddleInference GPU backend for OCR-Rec model (#258) * Add PaddleInference GPU backend for Rec model * Improve the order of deafult backends --- fastdeploy/vision/ocr/ppocr/classifier.cc | 5 +++-- fastdeploy/vision/ocr/ppocr/recognizer.cc | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fastdeploy/vision/ocr/ppocr/classifier.cc b/fastdeploy/vision/ocr/ppocr/classifier.cc index c8ce1ccc1..2dcb35eb3 100644 --- a/fastdeploy/vision/ocr/ppocr/classifier.cc +++ b/fastdeploy/vision/ocr/ppocr/classifier.cc @@ -26,11 +26,12 @@ Classifier::Classifier(const std::string& model_file, const RuntimeOption& custom_option, const Frontend& model_format) { if (model_format == Frontend::ONNX) { - valid_cpu_backends = {Backend::ORT, Backend::OPENVINO}; // 指定可用的CPU后端 + valid_cpu_backends = {Backend::ORT, + Backend::OPENVINO}; // 指定可用的CPU后端 valid_gpu_backends = {Backend::ORT, Backend::TRT}; // 指定可用的GPU后端 } else { valid_cpu_backends = {Backend::PDINFER, Backend::ORT, Backend::OPENVINO}; - valid_gpu_backends = {Backend::PDINFER, Backend::TRT, Backend::ORT}; + valid_gpu_backends = {Backend::PDINFER, Backend::ORT, Backend::TRT}; } runtime_option = custom_option; runtime_option.model_format = model_format; diff --git a/fastdeploy/vision/ocr/ppocr/recognizer.cc b/fastdeploy/vision/ocr/ppocr/recognizer.cc index 3e74f5a8c..b91719009 100644 --- a/fastdeploy/vision/ocr/ppocr/recognizer.cc +++ b/fastdeploy/vision/ocr/ppocr/recognizer.cc @@ -44,12 +44,12 @@ Recognizer::Recognizer(const std::string& model_file, const RuntimeOption& custom_option, const Frontend& model_format) { if (model_format == Frontend::ONNX) { - valid_cpu_backends = {Backend::ORT, Backend::OPENVINO}; // 指定可用的CPU后端 + valid_cpu_backends = {Backend::ORT, + Backend::OPENVINO}; // 指定可用的CPU后端 valid_gpu_backends = {Backend::ORT, Backend::TRT}; // 指定可用的GPU后端 } else { - // NOTE:此模型暂不支持paddle-inference-Gpu推理 - valid_cpu_backends = {Backend::ORT, Backend::PDINFER, Backend::OPENVINO}; - valid_gpu_backends = {Backend::ORT, Backend::TRT}; + valid_cpu_backends = {Backend::PDINFER, Backend::ORT, Backend::OPENVINO}; + valid_gpu_backends = {Backend::PDINFER, Backend::ORT, Backend::TRT}; } runtime_option = custom_option;