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

yolov5 servitization optimization (#262)

Browse Source 
* yolov5 split pre and post process

* yolov5 postprocess

* yolov5 postprocess
This commit is contained in:
heliqi
2022-09-21 05:22:39 -05:00
committed by GitHub
parent 463ee0a088
commit a8e447f225
9 changed files with 194 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
fastdeploy/vision/detection/contrib/yolov5_pybind.cc
View File

@@ -26,13 +26,43 @@ void BindYOLOv5(pybind11::module& m) {
self.Predict(&mat, &res, conf_threshold, nms_iou_threshold);
return res;
})
.def_readwrite("size", &vision::detection::YOLOv5::size)
.def_readwrite("padding_value", &vision::detection::YOLOv5::padding_value)
.def_readwrite("is_mini_pad", &vision::detection::YOLOv5::is_mini_pad)
.def_readwrite("is_no_pad", &vision::detection::YOLOv5::is_no_pad)
.def_readwrite("is_scale_up", &vision::detection::YOLOv5::is_scale_up)
.def_readwrite("stride", &vision::detection::YOLOv5::stride)
.def_readwrite("max_wh", &vision::detection::YOLOv5::max_wh)
.def_readwrite("multi_label", &vision::detection::YOLOv5::multi_label);
.def_static("preprocess",
[](pybind11::array& data, const std::vector<int>& size,
const std::vector<float> padding_value, bool is_mini_pad,
bool is_no_pad, bool is_scale_up, int stride, float max_wh,
bool multi_label) {
auto mat = PyArrayToCvMat(data);
fastdeploy::vision::Mat fd_mat(mat);
FDTensor output;
std::map<std::string, std::array<float, 2>> im_info;
vision::detection::YOLOv5::Preprocess(
&fd_mat, &output, &im_info, size, padding_value,
is_mini_pad, is_no_pad, is_scale_up, stride, max_wh,
multi_label);
return make_pair(TensorToPyArray(output), im_info);
})
.def_static(
"postprocess",
[](std::vector<pybind11::array> infer_results,
const std::map<std::string, std::array<float, 2>>& im_info,
float conf_threshold, float nms_iou_threshold, bool multi_label,
float max_wh) {
std::vector<FDTensor> fd_infer_results(infer_results.size());
PyArrayToTensorList(infer_results, &fd_infer_results, true);
vision::DetectionResult result;
vision::detection::YOLOv5::Postprocess(
fd_infer_results, &result, im_info, conf_threshold,
nms_iou_threshold, multi_label, max_wh);
return result;
})
.def_readwrite("size", &vision::detection::YOLOv5::size_)
.def_readwrite("padding_value",
&vision::detection::YOLOv5::padding_value_)
.def_readwrite("is_mini_pad", &vision::detection::YOLOv5::is_mini_pad_)
.def_readwrite("is_no_pad", &vision::detection::YOLOv5::is_no_pad_)
.def_readwrite("is_scale_up", &vision::detection::YOLOv5::is_scale_up_)
.def_readwrite("stride", &vision::detection::YOLOv5::stride_)
.def_readwrite("max_wh", &vision::detection::YOLOv5::max_wh_)
.def_readwrite("multi_label", &vision::detection::YOLOv5::multi_label_);
}
} // namespace fastdeploy