[Model] Refactor PaddleDetection module (PaddlePaddle#575)

* Add namespace for functions * Refactor PaddleDetection module * finish all the single image test * Update preprocessor.cc * fix some litte detail * add python api * Update postprocessor.cc
Xiue233 · Nov 15, 2022 · beaa0fd · beaa0fd
1 parent aa21272
commit beaa0fd
Show file tree

Hide file tree

Showing 39 changed files with 1,278 additions and 1,434 deletions.
diff --git a/examples/vision/detection/paddledetection/python/infer_mask_rcnn.py b/examples/vision/detection/paddledetection/python/infer_mask_rcnn.py
@@ -66,4 +66,3 @@ def build_option(args):
 vis_im = fd.vision.vis_detection(im, result, score_threshold=0.5)
 cv2.imwrite("visualized_result.jpg", vis_im)
 print("Visualized result save in ./visualized_result.jpg")
-print(runtime_option)
diff --git a/fastdeploy/pipeline/pptinypose/pipeline.cc b/fastdeploy/pipeline/pptinypose/pipeline.cc
@@ -17,7 +17,7 @@
 namespace fastdeploy {
 namespace pipeline {
 PPTinyPose::PPTinyPose(
-    fastdeploy::vision::detection::PPYOLOE* det_model,
+    fastdeploy::vision::detection::PicoDet* det_model,
     fastdeploy::vision::keypointdetection::PPTinyPose* pptinypose_model)
     : detector_(det_model), pptinypose_model_(pptinypose_model) {}
 

diff --git a/fastdeploy/pipeline/pptinypose/pipeline.h b/fastdeploy/pipeline/pptinypose/pipeline.h
@@ -35,7 +35,7 @@ class FASTDEPLOY_DECL PPTinyPose {
    * \param[in] pptinypose_model Initialized pptinypose model object
    */
   PPTinyPose(
-      fastdeploy::vision::detection::PPYOLOE* det_model,
+      fastdeploy::vision::detection::PicoDet* det_model,
       fastdeploy::vision::keypointdetection::PPTinyPose* pptinypose_model);
 
   /** \brief Predict the keypoint detection result for an input image
@@ -52,7 +52,7 @@ class FASTDEPLOY_DECL PPTinyPose {
   float detection_model_score_threshold = 0;
 
  protected:
-  fastdeploy::vision::detection::PPYOLOE* detector_ = nullptr;
+  fastdeploy::vision::detection::PicoDet* detector_ = nullptr;
   fastdeploy::vision::keypointdetection::PPTinyPose* pptinypose_model_ =
       nullptr;
 

diff --git a/fastdeploy/pipeline/pptinypose/pptinyposepipeline_pybind.cc b/fastdeploy/pipeline/pptinypose/pptinyposepipeline_pybind.cc
@@ -18,31 +18,8 @@ namespace fastdeploy {
 void BindPPTinyPosePipeline(pybind11::module& m) {
   pybind11::class_<pipeline::PPTinyPose>(m, "PPTinyPose")
 
-      // explicitly pybind more kinds of detection models here
-      .def(pybind11::init<fastdeploy::vision::detection::PPYOLOE*,
-                          fastdeploy::vision::keypointdetection::PPTinyPose*>())
-
       .def(pybind11::init<fastdeploy::vision::detection::PicoDet*,
                           fastdeploy::vision::keypointdetection::PPTinyPose*>())
-
-      .def(pybind11::init<fastdeploy::vision::detection::PPYOLO*,
-                          fastdeploy::vision::keypointdetection::PPTinyPose*>())
-
-      .def(pybind11::init<fastdeploy::vision::detection::PPYOLOv2*,
-                          fastdeploy::vision::keypointdetection::PPTinyPose*>())
-
-      .def(pybind11::init<fastdeploy::vision::detection::PaddleYOLOX*,
-                          fastdeploy::vision::keypointdetection::PPTinyPose*>())
-
-      .def(pybind11::init<fastdeploy::vision::detection::FasterRCNN*,
-                          fastdeploy::vision::keypointdetection::PPTinyPose*>())
-
-      .def(pybind11::init<fastdeploy::vision::detection::YOLOv3*,
-                          fastdeploy::vision::keypointdetection::PPTinyPose*>())
-
-      .def(pybind11::init<fastdeploy::vision::detection::MaskRCNN*,
-                          fastdeploy::vision::keypointdetection::PPTinyPose*>())
-
       .def("predict", [](pipeline::PPTinyPose& self,
                          pybind11::array& data) {
         auto mat = PyArrayToCvMat(data);

diff --git a/fastdeploy/vision.h b/fastdeploy/vision.h
@@ -29,7 +29,6 @@
 #include "fastdeploy/vision/detection/contrib/yolov7end2end_trt.h"
 #include "fastdeploy/vision/detection/contrib/yolox.h"
 #include "fastdeploy/vision/detection/ppdet/model.h"
-#include "fastdeploy/vision/detection/contrib/rknpu2/model.h"
 #include "fastdeploy/vision/facedet/contrib/retinaface.h"
 #include "fastdeploy/vision/facedet/contrib/scrfd.h"
 #include "fastdeploy/vision/facedet/contrib/ultraface.h"

diff --git a/fastdeploy/vision/detection/contrib/rknpu2/model.h b/fastdeploy/vision/detection/contrib/rknpu2/model.h
diff --git a/fastdeploy/vision/detection/contrib/rknpu2/rkdet_pybind.cc b/fastdeploy/vision/detection/contrib/rknpu2/rkdet_pybind.cc
diff --git a/fastdeploy/vision/detection/contrib/rknpu2/rkpicodet.cc b/fastdeploy/vision/detection/contrib/rknpu2/rkpicodet.cc
diff --git a/fastdeploy/vision/detection/contrib/rknpu2/rkpicodet.h b/fastdeploy/vision/detection/contrib/rknpu2/rkpicodet.h
diff --git a/fastdeploy/vision/detection/detection_pybind.cc b/fastdeploy/vision/detection/detection_pybind.cc
@@ -27,8 +27,6 @@ void BindNanoDetPlus(pybind11::module& m);
 void BindPPDet(pybind11::module& m);
 void BindYOLOv7End2EndTRT(pybind11::module& m);
 void BindYOLOv7End2EndORT(pybind11::module& m);
-void BindRKDet(pybind11::module& m);
-
 
 void BindDetection(pybind11::module& m) {
   auto detection_module =
@@ -44,6 +42,5 @@ void BindDetection(pybind11::module& m) {
   BindNanoDetPlus(detection_module);
   BindYOLOv7End2EndTRT(detection_module);
   BindYOLOv7End2EndORT(detection_module);
-  BindRKDet(detection_module);
 }
 }  // namespace fastdeploy