Skip to content

[Other] Improve the Predict Interface of PP-OCR models. #1448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 153 commits into from
Mar 2, 2023
Merged
Changes from 148 commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
a5e3c1e
Add Huawei Ascend NPU deploy through PaddleLite CANN
yunyaoXYY Nov 30, 2022
e1aa652
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Nov 30, 2022
e957f8a
Add NNAdapter interface for paddlelite
yunyaoXYY Dec 1, 2022
d1a1d3b
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 1, 2022
21a06de
Modify Huawei Ascend Cmake
yunyaoXYY Dec 5, 2022
9d96aca
Fix conflict
yunyaoXYY Dec 5, 2022
6cc4ea9
Update way for compiling Huawei Ascend NPU deployment
yunyaoXYY Dec 5, 2022
b4bdf60
remove UseLiteBackend in UseCANN
yunyaoXYY Dec 5, 2022
606aeb6
Support compile python whlee
yunyaoXYY Dec 7, 2022
dba439d
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 7, 2022
47af3f0
Change names of nnadapter API
yunyaoXYY Dec 7, 2022
e791c5e
Add nnadapter pybind and remove useless API
yunyaoXYY Dec 7, 2022
a4dcef9
Support Python deployment on Huawei Ascend NPU
yunyaoXYY Dec 7, 2022
95b8fad
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 7, 2022
e78faf9
Fix links in readme
yunyaoXYY Dec 8, 2022
518fd78
Fix links in readme
yunyaoXYY Dec 8, 2022
e82df43
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 8, 2022
1b59025
Update PPOCRv2/v3 examples
yunyaoXYY Dec 8, 2022
5973198
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 8, 2022
e986926
Update auto compression configs
yunyaoXYY Dec 9, 2022
e13218d
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 9, 2022
f2e350f
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 12, 2022
ad84008
Add neww quantization support for paddleclas model
yunyaoXYY Dec 12, 2022
d65023b
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 12, 2022
fd0a3be
Update quantized Yolov6s model download link
yunyaoXYY Dec 12, 2022
1cf54a0
Improve PPOCR comments
yunyaoXYY Dec 13, 2022
d62e40f
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 13, 2022
e52c728
Add models suppor for ascend
yunyaoXYY Dec 19, 2022
7bef837
Add PPOCR rec reszie for ascend
yunyaoXYY Dec 19, 2022
e7eea47
fix conflicts for ascend
yunyaoXYY Dec 19, 2022
f920096
fix conflict for ascend
yunyaoXYY Dec 19, 2022
ae08bc8
Rename CANN to Ascend
yunyaoXYY Dec 19, 2022
0031e3e
Rename CANN to Ascend
yunyaoXYY Dec 19, 2022
70bae83
Improve ascend
yunyaoXYY Dec 19, 2022
b20eebd
fix ascend bug
yunyaoXYY Dec 20, 2022
cdca2f3
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 20, 2022
8b18207
improve ascend docs
yunyaoXYY Dec 20, 2022
b2068e4
improve ascend docs
yunyaoXYY Dec 20, 2022
7212c14
improve ascend docs
yunyaoXYY Dec 20, 2022
b1d7aa3
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 20, 2022
65aacd9
Add English doc for quantization
yunyaoXYY Dec 20, 2022
6e39b5f
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 20, 2022
8a86073
Improve Ascend
yunyaoXYY Dec 20, 2022
e0f9171
Improve Ascend
yunyaoXYY Dec 20, 2022
4373450
Move ascend python demo
yunyaoXYY Dec 20, 2022
50be9f8
Imporve ascend
yunyaoXYY Dec 20, 2022
c85c1ae
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 20, 2022
411baca
Fix PPOCR rec model bug
yunyaoXYY Dec 21, 2022
e5488c1
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 21, 2022
2439fdc
fix conflict
yunyaoXYY Dec 21, 2022
d6588b2
Improve ascend
yunyaoXYY Dec 22, 2022
d71e38f
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 22, 2022
13a8eb2
Improve ascend
yunyaoXYY Dec 22, 2022
6dbfe9b
Improve ascend
yunyaoXYY Dec 22, 2022
5dc8bab
Improve ascend
yunyaoXYY Dec 22, 2022
affe91a
Add new paddleseg quantization support
yunyaoXYY Dec 22, 2022
f73b945
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 22, 2022
97328f9
Add new paddleseg quantization support
yunyaoXYY Dec 22, 2022
f2747a4
Add new paddleseg quantization support
yunyaoXYY Dec 22, 2022
27e0bd7
Add new paddleseg quantization support
yunyaoXYY Dec 22, 2022
db9ebff
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 22, 2022
5415a0e
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 22, 2022
5f4bcd1
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 22, 2022
7e18b95
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 22, 2022
9fb7e9a
Imporve ascend
yunyaoXYY Dec 23, 2022
9612a68
Imporve ascend
yunyaoXYY Dec 23, 2022
5129ca2
Improve ascend
yunyaoXYY Dec 25, 2022
d0919de
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 25, 2022
72d0a23
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 26, 2022
27a3cf1
acc eval script
yunyaoXYY Dec 26, 2022
8ca1aef
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 26, 2022
84aa52b
acc eval
yunyaoXYY Dec 26, 2022
daa0820
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 27, 2022
76a8764
remove acc_eval from branch huawei
yunyaoXYY Dec 27, 2022
090c3a6
Add detection and segmentation examples for Ascend deployment
yunyaoXYY Dec 27, 2022
73e70e0
Add detection and segmentation examples for Ascend deployment
yunyaoXYY Dec 27, 2022
471f0f6
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 27, 2022
01b0268
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 28, 2022
c30ef19
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 28, 2022
2a1ac10
Add Ascend model list
yunyaoXYY Dec 28, 2022
64d67da
Add ascend model list
yunyaoXYY Dec 28, 2022
6286ad2
Add ascend model list
yunyaoXYY Dec 28, 2022
22d9fce
Add ascend model list
yunyaoXYY Dec 28, 2022
ab9dc22
Add ascend model list
yunyaoXYY Dec 28, 2022
785bd7d
Add ascend model list
yunyaoXYY Dec 28, 2022
1f6b9ef
Add ascend model list
yunyaoXYY Dec 28, 2022
d256bd7
Add ascend model list
yunyaoXYY Dec 28, 2022
b6903b0
Add PPOCR example for ascend deploy
yunyaoXYY Dec 28, 2022
3ed19b1
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 28, 2022
52d4103
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 28, 2022
13fe6c8
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 29, 2022
ac07fe9
Imporve paddle lite compiliation
yunyaoXYY Dec 30, 2022
42da685
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Dec 30, 2022
f054d92
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 3, 2023
dc13433
Add FlyCV doc
yunyaoXYY Jan 3, 2023
dae28b1
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 3, 2023
945357e
Add FlyCV doc
yunyaoXYY Jan 3, 2023
e0a669a
Add FlyCV doc
yunyaoXYY Jan 3, 2023
e045d19
Imporve Ascend docs
yunyaoXYY Jan 3, 2023
12359dd
Imporve Ascend docs
yunyaoXYY Jan 3, 2023
bf02996
fix conflict
yunyaoXYY Jan 4, 2023
0aab332
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 4, 2023
584916b
Improve PPOCR example
yunyaoXYY Jan 4, 2023
87f442a
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 4, 2023
5f2f1d1
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 4, 2023
eb0c875
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 4, 2023
26e98fc
Support Ascend deployment on X86 platform
yunyaoXYY Jan 5, 2023
5cd165a
Improve Ascend docs
yunyaoXYY Jan 5, 2023
9920cc8
Improve ascend
yunyaoXYY Jan 5, 2023
a842996
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 5, 2023
fa5428d
Improve ascend
yunyaoXYY Jan 5, 2023
0e9da67
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 5, 2023
64c8c2b
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 5, 2023
d052ec0
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 6, 2023
d9cdea4
Change Paddle Lite Ascend URL
yunyaoXYY Jan 9, 2023
33489e5
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 9, 2023
3141edd
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 9, 2023
9908115
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 10, 2023
b94706f
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 10, 2023
302dfb9
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 10, 2023
b022377
Merge branch 'huawei' of github.com:yunyaoXYY/FastDeploy into huawei
yunyaoXYY Jan 10, 2023
c14f9cf
fix ascend docs
yunyaoXYY Jan 10, 2023
e6c704c
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 10, 2023
1334b21
fix ascend docs
yunyaoXYY Jan 10, 2023
05e426b
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Jan 11, 2023
c4bacb5
Merge branch 'huawei' of github.com:yunyaoXYY/FastDeploy into huawei
yunyaoXYY Jan 11, 2023
b69e7a2
Merge branch 'develop' of github.com:yunyaoXYY/FastDeploy into new_dev
yunyaoXYY Jan 31, 2023
b9b115a
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 2, 2023
c6a2370
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 2, 2023
ea9a74c
Fix Paddle Lite Ascend Lib
yunyaoXYY Feb 2, 2023
02f4f2a
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 2, 2023
c2c8d39
Merge branch 'develop' of github.com:yunyaoXYY/FastDeploy into huawei
yunyaoXYY Feb 2, 2023
2141492
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 6, 2023
d5ea34b
Imporve compile of Ascend
yunyaoXYY Feb 6, 2023
8f4ac33
Imporve compile of Ascend
yunyaoXYY Feb 6, 2023
c0a419a
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 8, 2023
4c43b7d
fix paddle lite compile
yunyaoXYY Feb 8, 2023
4385417
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 17, 2023
01fa072
Merge branch 'develop' of github.com:yunyaoXYY/FastDeploy into new_dev
yunyaoXYY Feb 17, 2023
c8f46a2
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 20, 2023
0b5a8ae
Remove useless opencv code for ocr
yunyaoXYY Feb 20, 2023
b2e13db
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 20, 2023
cbe7066
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 20, 2023
5a2f286
Improve PPOCR API docs
yunyaoXYY Feb 23, 2023
7447e4b
Improve PPOCR API docs
yunyaoXYY Feb 23, 2023
e27a5c8
Improve PPOCR API docs
yunyaoXYY Feb 23, 2023
8c3046f
Improve PPOCR API docs
yunyaoXYY Feb 23, 2023
25eae73
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 27, 2023
444f328
Improve det_model pybind
yunyaoXYY Feb 27, 2023
d09fbd8
Improve interface
yunyaoXYY Feb 28, 2023
8035210
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 28, 2023
1f35685
Merge branch 'develop' of https://github.com/yunyaoXYY/FastDeploy int…
yunyaoXYY Feb 28, 2023
1364531
Merge branch 'develop' of https://github.com/PaddlePaddle/FastDeploy …
yunyaoXYY Feb 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions fastdeploy/vision/ocr/ppocr/ocrmodel_pybind.cc
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ void BindPPOCRModel(pybind11::module& m) {
auto mat = PyArrayToCvMat(data);
std::vector<std::array<int, 8>> boxes_result;
self.Predict(mat, &boxes_result);
return boxes_result;
vision::OCRResult ocr_result;
ocr_result.boxes = boxes_result;
return ocr_result;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里不要只单独修改Python接口,如果要返回是OCRResult,那cpp/python都统一一致

})
.def("batch_predict", [](vision::ocr::DBDetector& self,
std::vector<pybind11::array>& data) {
Expand All @@ -129,7 +131,12 @@ void BindPPOCRModel(pybind11::module& m) {
images.push_back(PyArrayToCvMat(data[i]));
}
self.BatchPredict(images, &det_results);
return det_results;
std::vector<vision::OCRResult> ocr_results;
ocr_results.resize(det_results.size());
for (int i = 0; i < det_results.size(); i++) {
ocr_results[i].boxes = det_results[i];
}
return ocr_results;
});

// Classifier
Expand Down