Add PaddleOCR-DBDetector Model Support #52
Merged
Conversation
This file contains hidden or 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
|
|
jiangjiajun
requested changes
Jul 28, 2022
jiangjiajun
requested changes
Aug 9, 2022
| int gpu_id = 0; | ||
|
|
||
| bool delete_pass = false; | ||
| std::string delete_pass_name = ""; |
Collaborator
There was a problem hiding this comment.
将delete_pass_name改为std::vector<std::string> delete_pass_names
然后不用添加bool delete_pass这个参数了，默认就是会遍历delete_pass_names，挨个删除
|
|
||
| void RuntimeOption::DisablePaddleMKLDNN() { pd_enable_mkldnn = false; } | ||
|
|
||
| void RuntimeOption::EnablePaddleDeletePass(std::string pass_name) { |
Collaborator
There was a problem hiding this comment.
这里同理，就将函数改为RuntimeOption::DeletePaddlePass(const std::string& pass_name) 这个函数每调用一次，就往delete_pass_names里面push_back一次
| pd_option.use_gpu = (option.device == Device::GPU) ? true : false; | ||
| pd_option.gpu_id = option.device_id; | ||
| pd_option.delete_pass = option.pd_delete_pass; | ||
| pd_option.delete_pass_name = option.pd_delete_pass_name; |
Collaborator
There was a problem hiding this comment.
PaddleBackendOption同样也增加delete_pass_names这个参数，这里就直接赋过去即可
| // disable mkldnn while use paddle inference in CPU | ||
| void DisablePaddleMKLDNN(); | ||
| // Enable delete in pass | ||
| void EnablePaddleDeletePass(std::string delete_pass_name); |
| std::string Str(); | ||
| }; | ||
|
|
||
| struct FASTDEPLOY_DECL OCRPredictResult : public BaseResult { |
Collaborator
There was a problem hiding this comment.
改为OcrResult，不加Predict了，跟type里面里面的那个OCR也对应了
|
|
||
| const Frontend& det_model_format, const Frontend& cls_model_format, | ||
| const Frontend& rec_model_format) { | ||
| if (use_det) { |
| namespace vision { | ||
| namespace ppocr { | ||
|
|
||
| PPocrsys::PPocrsys( |
Collaborator
There was a problem hiding this comment.
system放在application下面。 fastdeploy::application::OCRSystem
examples/vision/ppocrv2_sys.cc
Outdated
| "../resources/models/ch_PP-OCRv2_rec_infer/inference.pdmodel"; | ||
| std::string rec_params_file = | ||
| "../resources/models/ch_PP-OCRv2_rec_infer/inference.pdiparams"; | ||
|
|
Collaborator
There was a problem hiding this comment.
application::PPOCRSystemv2()
application::PPOCRSystemv3()
在这里去做32/48的切换
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
新增PaddleOCR的检测模型