Skip to content
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

[Backend] Add YOLOv5、PPYOLOE and PP-Liteseg for RV1126 #647

Merged
merged 21 commits into from
Dec 5, 2022
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
750a0b5
add yolov5 and ppyoloe for rk1126
yeliang2258 Nov 21, 2022
c986c4b
Merge remote-tracking branch 'upstream/develop' into rk1126_demo_1_dev
yeliang2258 Nov 21, 2022
3ce8f23
Merge branch 'develop' into rk1126_demo_1_dev
jiangjiajun Nov 22, 2022
409dc85
Merge branch 'develop' into rk1126_demo_1_dev
jiangjiajun Nov 22, 2022
7b1d546
update code, rename rk1126 to rv1126
yeliang2258 Nov 24, 2022
a2f1c6a
Merge branch 'rk1126_demo_1_dev' of https://github.com/yeliang2258/Fa…
yeliang2258 Nov 24, 2022
3d82a4e
Merge remote-tracking branch 'upstream/develop' into rk1126_demo_1_dev
yeliang2258 Nov 24, 2022
442f7dc
add PP-Liteseg
yeliang2258 Nov 30, 2022
7a306a7
update lite lib
yeliang2258 Nov 30, 2022
af0b598
Merge remote-tracking branch 'upstream/develop' into rk1126_demo_1_dev
yeliang2258 Nov 30, 2022
66de8ac
Merge remote-tracking branch 'upstream/develop' into rk1126_demo_1_dev
yeliang2258 Nov 30, 2022
336675a
updade doc for PPYOLOE
yeliang2258 Nov 30, 2022
6d1e5a5
update doc
yeliang2258 Nov 30, 2022
c759eaa
fix docs
yeliang2258 Nov 30, 2022
7a5044d
Merge remote-tracking branch 'upstream/develop' into rk1126_demo_1_dev
yeliang2258 Nov 30, 2022
cc34af4
fix doc and examples
yeliang2258 Dec 5, 2022
5c42a38
Merge remote-tracking branch 'upstream/develop' into rk1126_demo_1_dev
yeliang2258 Dec 5, 2022
cade7ea
update code
yeliang2258 Dec 5, 2022
07497c9
uodate doc
yeliang2258 Dec 5, 2022
d8dc6f5
Merge remote-tracking branch 'upstream/develop' into rk1126_demo_1_dev
yeliang2258 Dec 5, 2022
d7db32b
update doc
yeliang2258 Dec 5, 2022
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
12 changes: 6 additions & 6 deletions README_CN.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![⚡️FastDeploy](https://user-images.githubusercontent.com/31974251/185771818-5d4423cd-c94c-4a49-9894-bc7a8d1c29d0.png)

</p>

<p align="center">
<a href="./LICENSE"><img src="https://img.shields.io/badge/license-Apache%202-dfd.svg"></a>
<a href="https://github.com/PaddlePaddle/FastDeploy/releases"><img src="https://img.shields.io/github/v/release/PaddlePaddle/FastDeploy?color=ffa"></a>
Expand Down Expand Up @@ -55,11 +55,11 @@
- [测试功能] 新增OpenVINO后端Device设置,支持集显/独立显卡的调用;
- **📲 移动端和端侧部署:支持更多模型**
- 新增Android图像分类、目标检测、语义分割、OCR、人脸检测 APK工程及示例.

|<font size=3>图像分类</font>|<font size=3>目标检测</font>|<font size=3>语义分割</font>|<font size=3>文字识别</font>|<font size=3>人脸检测</font>|
|:---:|:---:|:---:|:---:|:---:|
|<font size=2>[工程代码](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/classification)</font>|<font size=2>[工程代码](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection)</font>|<font size=2>[工程代码](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation)|<font size=2>[工程代码](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr)</font>|<font size=2>[工程代码](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet)</font>|
|<font size=2>[扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-MobileNetV1.apk)</font>|<font size=2>[扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-PicoDet.apk)</font>| <font size=2>[扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-Portrait-HumanSegV2-Lite.apk)</font>| <font size=2> [扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-PP-OCRv2.apk)</font>|<font size=2> [扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-SCRFD.apk)</font>|
|<font size=2>[扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-MobileNetV1.apk)</font>|<font size=2>[扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-PicoDet.apk)</font>| <font size=2>[扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-Portrait-HumanSegV2-Lite.apk)</font>| <font size=2> [扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-PP-OCRv2.apk)</font>|<font size=2> [扫码或点击链接<br>安装试用](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-SCRFD.apk)</font>|
| <img src=https://user-images.githubusercontent.com/54695910/203604502-991972a8-5a9c-49cd-9e58-ed8e2a942b9b.png height="90" width="100"> |<img src=https://user-images.githubusercontent.com/54695910/203604475-724be708-27d6-4e56-9c2f-ae2eca24118c.png height="90" width="100">|<img src=https://user-images.githubusercontent.com/54695910/203604459-9a2915bc-91dc-460c-bff6-a0e2584d2eff.png height="90" width="100">|<img src=https://user-images.githubusercontent.com/54695910/203604453-6ce0118e-7b93-4044-8a92-56f2ab65c26a.png height="90" width="100">|<img src=https://user-images.githubusercontent.com/54695910/203604418-7c9703b5-1805-457e-966c-5a6625f212ff.png height="90" width="100">|

- [**more releases information**](./releases)
Expand Down Expand Up @@ -302,7 +302,7 @@ int main(int argc, char* argv[]) {
<div id="fastdeploy-edge-models"></div>

### 端侧模型支持列表

<details open><summary><b> 端侧模型支持列表(点击可收缩)</b></summary><div>

<div align="center">
Expand Down Expand Up @@ -353,7 +353,7 @@ int main(int argc, char* argv[]) {
## 🌐 Web和小程序部署

<div id="fastdeploy-web-models"></div>

<details open><summary><b> Web和小程序部署支持列表(点击可收缩)</b></summary><div>

| 任务场景 | 模型 | [web_demo](examples/application/js/web_demo) |
Expand All @@ -367,7 +367,7 @@ int main(int argc, char* argv[]) {
| OCR | [PaddleOCR/PP-OCRv3](./examples/application/js/web_demo/src/pages/cv/ocr) | ✅ |

</div></details>

<div id="fastdeploy-community"></div>

## 社区交流
Expand Down
52 changes: 26 additions & 26 deletions README_EN.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ Including image classification, object detection, image segmentation, face detec
- **Community**
- **Slack**:Join our [Slack community](https://join.slack.com/t/fastdeployworkspace/shared_invite/zt-1hhvpb279-iw2pNPwrDaMBQ5OQhO3Siw) and chat with other community members about ideas.
- **WeChat**:Scan the QR code below using WeChat, follow the PaddlePaddle official account and fill out the questionnaire to join the WeChat group.

<div align="center">
<img src="https://user-images.githubusercontent.com/54695910/200145290-d5565d18-6707-4a0b-a9af-85fd36d35d13.jpg" width = "100" height = "100" />
</div>

- 🔥 **2022.11.23:Release FastDeploy [release v0.8.0](https://github.com/PaddlePaddle/FastDeploy/tree/release/0.8.0)** <br>

- **🖥️ Server-side and Cloud Deployment: Support more CV models, improve deployment performance**
- Support [PIPNet](./examples/vision/facealign/pipnet), [FaceLandmark1000](./examples/vision/facealign/face_landmark_1000) face alignment models deployment;
- Support [Video Super-Resolution](./examples/vision/sr) series model PP-MSVSR、EDVR、BasicVSR;
Expand All @@ -54,72 +54,72 @@ Including image classification, object detection, image segmentation, face detec
- Add Python API to_dlpack interface for FDTensor to support copyless transfer of FDTensor between frameworks.
- **📱 Mobile and Edge Device Deployment: support more CV model**
- Support Android image classification, target detection, semantic segmentation, OCR, face detection APK projects and examples.

|<font size=3>Image Classification</font>|<font size=3>Object Detection</font>|<font size=3>Semantic Segmentation</font>|<font size=3>OCR</font>|<font size=3>Face Detection</font>|
|:---:|:---:|:---:|:---:|:---:|
|<font size=2>[Project Code](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/classification)</font>|<font size=2>[Project Code](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/detection)</font>|<font size=2>[Project Code](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/segmentation)|<font size=2>[Project Code](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/ocr)</font>|<font size=2>[Project Code](https://github.com/PaddlePaddle/FastDeploy/tree/develop/java/android/app/src/main/java/com/baidu/paddle/fastdeploy/app/examples/facedet)</font>|
|<font size=2>[Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-MobileNetV1.apk)</font>|<font size=2>[Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-PicoDet.apk)</font>| <font size=2>[Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-Portrait-HumanSegV2-Lite.apk)</font>| <font size=2> [Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-PP-OCRv2.apk)</font>|<font size=2> [Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-SCRFD.apk)</font>|
|<font size=2>[Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-MobileNetV1.apk)</font>|<font size=2>[Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-PicoDet.apk)</font>| <font size=2>[Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-Portrait-HumanSegV2-Lite.apk)</font>| <font size=2> [Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-PP-OCRv2.apk)</font>|<font size=2> [Scan&nbsp;the&nbsp;code<br>or&nbsp;click&nbsp;on&nbsp;the&nbsp;link<br>to&nbsp;install](https://bj.bcebos.com/fastdeploy/release/android/FastDeploy-SCRFD.apk)</font>|
| <img src=https://user-images.githubusercontent.com/54695910/203604502-991972a8-5a9c-49cd-9e58-ed8e2a942b9b.png height="100" width="110"> |<img src=https://user-images.githubusercontent.com/54695910/203604475-724be708-27d6-4e56-9c2f-ae2eca24118c.png height="100" width="110">|<img src=https://user-images.githubusercontent.com/54695910/203604459-9a2915bc-91dc-460c-bff6-a0e2584d2eff.png height="100" width="110">|<img src=https://user-images.githubusercontent.com/54695910/203604453-6ce0118e-7b93-4044-8a92-56f2ab65c26a.png height="100" width="110">|<img src=https://user-images.githubusercontent.com/54695910/203604418-7c9703b5-1805-457e-966c-5a6625f212ff.png height="100" width="110">|

- [**more releases information**](./releases)

## Contents

* <details open><summary><b>📖 Tutorials(click to fold)</b></summary><div>

- Install

- [How to Install FastDeploy Prebuilt Libraries](docs/en/build_and_install/download_prebuilt_libraries.md)
- [How to Build and Install FastDeploy Library on GPU Platform](docs/en/build_and_install/gpu.md)
- [How to Build and Install FastDeploy Library on CPU Platform](docs/en/build_and_install/cpu.md)
- [How to Build and Install FastDeploy Library on IPU Platform](docs/en/build_and_install/ipu.md)
- [How to Build and Install FastDeploy Library on Nvidia Jetson Platform](docs/en/build_and_install/jetson.md)
- [How to Build and Install FastDeploy Library on Android Platform](docs/en/build_and_install/android.md)

- A Quick Start - Demos

- [Python Deployment Demo](docs/en/quick_start/models/python.md)
- [C++ Deployment Demo](docs/en/quick_start/models/cpp.md)
- [A Quick Start on Runtime Python](docs/en/quick_start/runtime/python.md)
- [A Quick Start on Runtime C++](docs/en/quick_start/runtime/cpp.md)

- API (To be continued)

- [Python API](https://baidu-paddle.github.io/fastdeploy-api/python/html/)
- [C++ API](https://baidu-paddle.github.io/fastdeploy-api/cpp/html/)

- Performance Optimization

- [Quantization Acceleration](docs/en/quantize.md)

- Frequent Q&As

- [1. How to Change Inference Backends](docs/en/faq/how_to_change_backend.md)
- [2. How to Use FastDeploy C++ SDK on Windows Platform](docs/en/faq/use_sdk_on_windows.md)
- [3. How to Use FastDeploy C++ SDK on Android Platform](docs/en/faq/use_sdk_on_android.md)(To be Continued)
- [4. Tricks of TensorRT](docs/en/faq/tensorrt_tricks.md)
- [5. How to Develop a New Model](docs/en/faq/develop_a_new_model.md)(To be Continued)

- More FastDeploy Deployment Module

- [deployment AI Model as a Service](./serving)

- [Benchmark Testing](./benchmark)

</div></details>

* **🖥️ Server-side and Cloud Deployment**

* [A Quick Start for Python SDK](#fastdeploy-quick-start-python)
* [A Quick Start for C++ SDK](#fastdeploy-quick-start-cpp)
* [Supported Server-side and Cloud Model List](#fastdeploy-server-models)

* **📱 Mobile and Edge Device Deployment**

* [Supported Mobile and Edge Model List](#fastdeploy-edge-models)

* **🌐 Browser and Mini Program Deployment**

* [Supported Web and Mini Program Model List](#fastdeploy-web-models)

* [**Community**](#fastdeploy-community)
Expand Down Expand Up @@ -320,15 +320,15 @@ Notes: ✅: already supported; ❔: to be supported in the future; N/A: Not Ava
| Speech | [PaddleSpeech/PP-TTS](./examples/text/uie) | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❔ | -- | ✅ |

</div></details>

<div id="fastdeploy-edge-doc"></div>

## 📱 Mobile and Edge Device Deployment

<div id="fastdeploy-edge-models"></div>

### Mobile and Edge Model List 🔥🔥🔥🔥

<details open><summary><b> Mobile and Edge Model List(click to fold)</b></summary><div>

<div align="center">
Expand Down Expand Up @@ -373,13 +373,13 @@ Notes: ✅: already supported; ❔: to be supported in the future; N/A: Not Ava
| OCR | [PaddleOCR/PP-OCRv2](examples/vision/ocr/PP-OCRv2) | 2.3+4.4 | ✅ | ❔ | ❔ | ❔ | -- | -- | -- | -- |
| OCR | [PaddleOCR/PP-OCRv3](examples/vision/ocr/PP-OCRv3) | 2.4+10.6 | ✅ | ❔ | ❔ | ❔ | ❔ | ❔ | ❔ | -- |
| OCR | PaddleOCR/PP-OCRv3-tiny | 2.4+10.7 | ❔ | ❔ | ❔ | ❔ | -- | -- | -- | -- |

</div></details>

## 🌐 Browser-based Model List

<div id="fastdeploy-web-models"></div>

<details open><summary><b> Browser-based Model List(click to fold)</b></summary><div>

| Task | Model | [web_demo](examples/application/js/web_demo) |
Expand All @@ -393,7 +393,7 @@ Notes: ✅: already supported; ❔: to be supported in the future; N/A: Not Ava
| OCR | [PaddleOCR/PP-OCRv3](./examples/application/js/web_demo/src/pages/cv/ocr) | ✅ |

</div></details>

## Community

<div id="fastdeploy-community"></div>
Expand Down
2 changes: 1 addition & 1 deletion cmake/paddlelite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ else() # Linux
if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
set(PADDLELITE_URL "${PADDLELITE_URL_PREFIX}/lite-linux-arm64-20220920.tgz")
elseif(TARGET_ABI MATCHES "armhf")
set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_armhf_1101.tgz")
set(PADDLELITE_URL "https://bj.bcebos.com/fastdeploy/test/lite-linux_armhf_1130.tgz")
yeliang2258 marked this conversation as resolved.
Show resolved Hide resolved
else()
message(FATAL_ERROR "Only support Linux aarch64 now, x64 is not supported with backend Paddle Lite.")
endif()
Expand Down
2 changes: 1 addition & 1 deletion docs/cn/build_and_install/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- [CPU部署环境编译安装](cpu.md)
- [Jetson部署环境编译安装](jetson.md)
- [Android平台部署环境编译安装](android.md)
- [瑞芯微RK1126部署环境编译安装](rk1126.md)
- [瑞芯微RV1126部署环境编译安装](rv1126.md)


## FastDeploy编译选项说明
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 瑞芯微 RK1126 部署环境编译安装
# 瑞芯微 RV1126 部署环境编译安装

FastDeploy基于 Paddle-Lite 后端支持在瑞芯微(Rockchip)Soc 上进行部署推理。
更多详细的信息请参考:[PaddleLite部署示例](https://paddle-lite.readthedocs.io/zh/develop/demo_guides/verisilicon_timvx.html)。
Expand Down Expand Up @@ -54,10 +54,10 @@ cmake -DCMAKE_TOOLCHAIN_FILE=./../cmake/timvx.cmake \
-DENABLE_VISION=ON \ # 是否编译集成视觉模型的部署模块,可选择开启
-Wno-dev ..

# Build FastDeploy RK1126 C++ SDK
# Build FastDeploy RV1126 C++ SDK
make -j8
make install
```
编译完成之后,会生成 fastdeploy-tmivx 目录,表示基于 PadddleLite TIM-VX 的 FastDeploy 库编译完成。

RK1126 上部署 PaddleClas 分类模型请参考:[PaddleClas RK1126开发板 C++ 部署示例](../../../examples/vision/classification/paddleclas/rk1126/README.md)
RV1126 上部署 PaddleClas 分类模型请参考:[PaddleClas RV1126开发板 C++ 部署示例](../../../examples/vision/classification/paddleclas/rv1126/README.md)
yeliang2258 marked this conversation as resolved.
Show resolved Hide resolved
11 changes: 0 additions & 11 deletions examples/vision/classification/paddleclas/rk1126/README.md

This file was deleted.

11 changes: 11 additions & 0 deletions examples/vision/classification/paddleclas/rv1126/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# PaddleClas 量化模型在 RV1126 上的部署
目前 FastDeploy 已经支持基于 PaddleLite 部署 PaddleClas 量化模型到 RV1126 上。

模型的量化和量化模型的下载请参考:[模型量化](../quantize/README.md)


## 详细部署文档

在 RV/home/yeliang/develop/FastDeploy/examples/vision/classification/paddleclas/rv1126/README.md1126 上只支持 C++ 的部署。
yeliang2258 marked this conversation as resolved.
Show resolved Hide resolved

- [C++部署](cpp)
Loading