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

[Model] update PPDet pybind and docs (#1550)

Browse Source 
update pybind and docs
This commit is contained in:
Zheng-Bicheng
2023-03-09 16:22:31 +08:00
committed by GitHub
parent 091e039991
commit 32f0d2e350
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/vision/detection/paddledetection/rknpu2/cpp/infer_picodet.cc
View File

@@ -58,7 +58,7 @@ void RKNPU2Infer(const std::string& model_dir, const std::string& image_file) {
model.GetPreprocessor().DisablePermute(); model.GetPreprocessor().DisablePermute();
model.GetPreprocessor().DisableNormalize(); model.GetPreprocessor().DisableNormalize();
model.GetPostprocessor().ApplyDecodeAndNMS(); model.GetPostprocessor().ApplyNMS();
auto im = cv::imread(image_file); auto im = cv::imread(image_file);

5
examples/vision/detection/paddledetection/rknpu2/cpp/infer_ppyoloe_demo.cc
View File

@@ -43,7 +43,8 @@ void ONNXInfer(const std::string& model_dir, const std::string& image_file) {
} }
void RKNPU2Infer(const std::string& model_dir, const std::string& image_file) { void RKNPU2Infer(const std::string& model_dir, const std::string& image_file) {
auto model_file = model_dir + "/ppyoloe_plus_crn_s_80e_coco_rk3588_quantized.rknn"; auto model_file =
model_dir + "/ppyoloe_plus_crn_s_80e_coco_rk3588_quantized.rknn";
auto params_file = ""; auto params_file = "";
auto config_file = model_dir + "/infer_cfg.yml"; auto config_file = model_dir + "/infer_cfg.yml";
@@ -57,7 +58,7 @@ void RKNPU2Infer(const std::string& model_dir, const std::string& image_file) {
model.GetPreprocessor().DisablePermute(); model.GetPreprocessor().DisablePermute();
model.GetPreprocessor().DisableNormalize(); model.GetPreprocessor().DisableNormalize();
model.GetPostprocessor().ApplyDecodeAndNMS(); model.GetPostprocessor().ApplyNMS();
auto im = cv::imread(image_file); auto im = cv::imread(image_file);

2
examples/vision/detection/paddledetection/rknpu2/cpp/infer_yolov8.cc
View File

@@ -57,7 +57,7 @@ void RKNPU2Infer(const std::string& model_dir, const std::string& image_file) {
model.GetPreprocessor().DisablePermute(); model.GetPreprocessor().DisablePermute();
model.GetPreprocessor().DisableNormalize(); model.GetPreprocessor().DisableNormalize();
model.GetPostprocessor().ApplyDecodeAndNMS(); model.GetPostprocessor().ApplyNMS();
auto im = cv::imread(image_file); auto im = cv::imread(image_file);

7
examples/vision/detection/paddledetection/rknpu2/python/README.md
View File

@@ -12,11 +12,10 @@ This directory provides `infer.py` for a quick example of Picodet deployment on
git clone https://github.com/PaddlePaddle/FastDeploy.git git clone https://github.com/PaddlePaddle/FastDeploy.git
cd FastDeploy/examples/vision/detection/paddledetection/rknpu2/python cd FastDeploy/examples/vision/detection/paddledetection/rknpu2/python
# Download images. # Download images and model
wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg
wget https://bj.bcebos.com/paddlehub/fastdeploy/rknpu2/picodet_s_416_coco_lcnet.zip
# copy model unzip picodet_s_416_coco_lcnet.zip
cp -r ./picodet_s_416_coco_lcnet /path/to/FastDeploy/examples/vision/detection/rknpu2detection/paddledetection/python
# Inference. # Inference.
python3 infer.py --model_file ./picodet_s_416_coco_lcnet/picodet_s_416_coco_lcnet_rk3568.rknn \ python3 infer.py --model_file ./picodet_s_416_coco_lcnet/picodet_s_416_coco_lcnet_rk3568.rknn \

6
examples/vision/detection/paddledetection/rknpu2/python/README_CN.md
View File

@@ -15,8 +15,10 @@ cd FastDeploy/examples/vision/detection/paddledetection/rknpu2/python
# 下载图片 # 下载图片
wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg
# copy model # 下载PPYOLOE模型文件和测试图片
cp -r ./picodet_s_416_coco_lcnet /path/to/FastDeploy/examples/vision/detection/rknpu2detection/paddledetection/python wget https://bj.bcebos.com/paddlehub/fastdeploy/rknpu2/picodet_s_416_coco_lcnet.zip
unzip picodet_s_416_coco_lcnet.zip
wget https://gitee.com/paddlepaddle/PaddleDetection/raw/release/2.4/demo/000000014439.jpg
# 推理 # 推理
python3 infer.py --model_file ./picodet_s_416_coco_lcnet/picodet_s_416_coco_lcnet_rk3568.rknn \ python3 infer.py --model_file ./picodet_s_416_coco_lcnet/picodet_s_416_coco_lcnet_rk3568.rknn \

2
examples/vision/detection/paddledetection/rknpu2/python/infer.py
View File

@@ -55,7 +55,7 @@ if __name__ == "__main__":
model_format=fd.ModelFormat.RKNN) model_format=fd.ModelFormat.RKNN)
model.preprocessor.disable_normalize() model.preprocessor.disable_normalize()
model.preprocessor.disable_permute() model.preprocessor.disable_permute()
model.postprocessor.apply_decode_and_nms() model.postprocessor.apply_nms()
# 预测图片分割结果 # 预测图片分割结果
im = cv2.imread(args.image) im = cv2.imread(args.image)

4
python/fastdeploy/vision/detection/ppdet/__init__.py
View File

@@ -74,14 +74,14 @@ class PaddleDetPostprocessor:
return self._postprocessor.run(runtime_results) return self._postprocessor.run(runtime_results)
def apply_nms(self): def apply_nms(self):
self.apply_nms() self._postprocessor.apply_nms()
def set_nms_option(self, nms_option=None): def set_nms_option(self, nms_option=None):
"""This function will enable decode and nms in postprocess step. """This function will enable decode and nms in postprocess step.
""" """
if nms_option is None: if nms_option is None:
nms_option = NMSOption() nms_option = NMSOption()
self._postprocessor.ApplyDecodeAndNMS(self, nms_option.nms_option) self._postprocessor.set_nms_option(self, nms_option.nms_option)
class PPYOLOE(FastDeployModel): class PPYOLOE(FastDeployModel):