[Model] Support PP-OCRv4 pipeline #1913
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ploy into test_benchmark
Test benchmark
Test benchmark
add paddledetection to benchmark
modified benchmark cmakelists
DefTruth
requested changes
May 10, 2023
| public: | ||
| /** \brief Set up the detection model path, classification model path and recognition model path respectively. | ||
| * | ||
| * \param[in] det_model Path of detection model, e.g ./ch_PP-OCRv3_det_infer |
There was a problem hiding this comment.
参数说明，ch_PP-OCRv3_det_infer改成ch_PP-OCRv4_det_infer，其他同理
| PPOCRv4(fastdeploy::vision::ocr::DBDetector* det_model, | ||
| fastdeploy::vision::ocr::Recognizer* rec_model) | ||
| : PPOCRv3(det_model, rec_model) { | ||
| // The only difference between v2 and v3 |
| logging.warning( | ||
| "DEPRECATED: fd.vision.ocr.PPOCRSystemv4 is deprecated, " | ||
| "please use fd.vision.ocr.PPOCRv4 instead.") | ||
| super(PPOCRSystemv3, self).__init__(det_model, cls_model, rec_model) |
There was a problem hiding this comment.
这里为什么是super(PPOCRSystemv3, self)，而不是super(PPOCRSystemv4, self)
| @@ -63,6 +63,26 @@ def vis_perception(im_data, | |||
| score_threshold, line_size, font_size) | |||
|
|
|||
|
|
|||
| def vis_perception(im_data, | |||
There was a problem hiding this comment.
这里有一份重复的vis_perception定义
benchmark/cpp/get_models.sh
Outdated
| @@ -140,6 +140,10 @@ download_fd_model_zxvf yolov8_m_500e_coco.tgz | |||
| download_fd_model_zxvf yolov8_n_500e_coco.tgz | |||
| download_fd_model_zxvf picodet_l_320_coco_lcnet.tgz | |||
| download_fd_model_zxvf yolov7_x_300e_coco.tgz | |||
| download_fd_model_zxvf ppyoloe_crn_l_300e_coco.tgz | |||
There was a problem hiding this comment.
这个PR为什么会多出benchmark_ppyolov8的修改，应该是只修改ocrv4
benchmark/python/benchmark_ppocr.py
Outdated
| rec_params_file, | ||
| rec_label_file, | ||
| runtime_option=rec_option) | ||
| model = fd.vision.ocr.PPOCRv3( |
There was a problem hiding this comment.
这里应该是fd.vision.ocr.PPOCRv3
DefTruth
approved these changes
May 11, 2023
|
LGTM |
DefTruth
added a commit
that referenced
this pull request
May 11, 2023
* 添加paddleclas模型 * 更新README_CN * 更新README_CN * 更新README * update get_model.sh * update get_models.sh * update paddleseg models * update paddle_seg models * update paddle_seg models * modified test resources * update benchmark_gpu_trt.sh * add paddle detection * add paddledetection to benchmark * modified benchmark cmakelists * update benchmark scripts * modified benchmark function calling * modified paddledetection documents * upadte getmodels.sh * add PaddleDetectonModel * reset examples/paddledetection * resolve conflict * update pybind * resolve conflict * fix bug * delete debug mode * update checkarch log * update trt inputs example * Update README.md * add ppocr_v4 * update ppocr_v4 * update ocr_v4 * update ocr_v4 * update ocr_v4 * update ocr_v4 --------- Co-authored-by: DefTruth <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR types(PR类型)
Description