apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-10-06 00:57:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Bug Fix] Fix PPOCR bug when cls model is not used (#695)

Browse Source 
* Imporve OCR Readme

* Improve OCR Readme

* Improve OCR Readme

* Improve OCR Readme

* Improve OCR Readme

* Add Initialize function to PP-OCR

* Add Initialize function to PP-OCR

* Add Initialize function to PP-OCR

* Make all the model links come from PaddleOCR

* Improve OCR readme

* Improve OCR readme

* Improve OCR readme

* Improve OCR readme

* Add Readme for vision results

* Add Readme for vision results

* Add Readme for vision results

* Add Readme for vision results

* Add Readme for vision results

* Add Readme for vision results

* Add Readme for vision results

* Add Readme for vision results

* Add Readme for vision results

* Add Readme for vision results

* Add check for label file in postprocess of Rec model

* Add check for label file in postprocess of Rec model

* Add check for label file in postprocess of Rec model

* Add check for label file in postprocess of Rec model

* Add check for label file in postprocess of Rec model

* Add check for label file in postprocess of Rec model

* Add comments to create API docs

* Improve OCR comments

* Rename OCR and add comments

* Make sure previous python example works

* Make sure previous python example works

* Fix Rec model bug

* Fix Rec model bug

* Fix rec model bug

* Add SetTrtMaxBatchSize function for TensorRT

* Add SetTrtMaxBatchSize Pybind

* Add set_trt_max_batch_size python function

* Set TRT dynamic shape in PPOCR examples

* Set TRT dynamic shape in PPOCR examples

* Set TRT dynamic shape in PPOCR examples

* Fix PPOCRv2 python example

* Fix PPOCR dynamic input shape bug

* Remove useless code

* Fix PPOCR bug

Co-authored-by: Jason <jiangjiajun@baidu.com>
This commit is contained in:
yunyaoXYY
2022-11-25 09:01:08 +08:00
committed by GitHub
parent 256f7c2269
commit d0fa2fcf5a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fastdeploy/vision/ocr/ppocr/ppocr_v2.cc
View File

@@ -93,17 +93,19 @@ bool PPOCRv2::BatchPredict(const std::vector<cv::Mat>& images,
std::vector<std::string>* text_ptr = &ocr_result.text; std::vector<std::string>* text_ptr = &ocr_result.text;
std::vector<float>* rec_scores_ptr = &ocr_result.rec_scores; std::vector<float>* rec_scores_ptr = &ocr_result.rec_scores;
if (!classifier_->BatchPredict(image_list, cls_labels_ptr, cls_scores_ptr)) { if (nullptr != classifier_){
FDERROR << "There's error while recognizing image in PPOCR." << std::endl; if (!classifier_->BatchPredict(image_list, cls_labels_ptr, cls_scores_ptr)) {
return false; FDERROR << "There's error while recognizing image in PPOCR." << std::endl;
}else{ return false;
for (size_t i_img = 0; i_img < image_list.size(); ++i_img) { }else{
if(cls_labels_ptr->at(i_img) % 2 == 1 && cls_scores_ptr->at(i_img) > classifier_->postprocessor_.cls_thresh_) { for (size_t i_img = 0; i_img < image_list.size(); ++i_img) {
cv::rotate(image_list[i_img], image_list[i_img], 1); if(cls_labels_ptr->at(i_img) % 2 == 1 && cls_scores_ptr->at(i_img) > classifier_->postprocessor_.cls_thresh_) {
cv::rotate(image_list[i_img], image_list[i_img], 1);
}
} }
} }
} }
if (!recognizer_->BatchPredict(image_list, text_ptr, rec_scores_ptr)) { if (!recognizer_->BatchPredict(image_list, text_ptr, rec_scores_ptr)) {
FDERROR << "There's error while recognizing image in PPOCR." << std::endl; FDERROR << "There's error while recognizing image in PPOCR." << std::endl;
return false; return false;