From ec91abbbc526c25fe2860b6dbfe6e97245f4912d Mon Sep 17 00:00:00 2001 From: ziqi-jin <67993288+ziqi-jin@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:13:17 +0800 Subject: [PATCH 01/15] Develop (#11) (#12) * Fix compile problem in different python version (#26) * fix some usage problem in linux * Fix compile problem Co-authored-by: root * Add PaddleDetetion/PPYOLOE model support (#22) * add ppdet/ppyoloe * Add demo code and documents * add convert processor to vision (#27) * update .gitignore * Added checking for cmake include dir * fixed missing trt_backend option bug when init from trt * remove un-need data layout and add pre-check for dtype * changed RGB2BRG to BGR2RGB in ppcls model * add model_zoo yolov6 c++/python demo * fixed CMakeLists.txt typos * update yolov6 cpp/README.md * add yolox c++/pybind and model_zoo demo * move some helpers to private * fixed CMakeLists.txt typos * add normalize with alpha and beta * add version notes for yolov5/yolov6/yolox * add copyright to yolov5.cc * revert normalize * fixed some bugs in yolox * fixed examples/CMakeLists.txt to avoid conflicts * add convert processor to vision * format examples/CMakeLists summary * Fix bug while the inference result is empty with YOLOv5 (#29) * Add multi-label function for yolov5 * Update README.md Update doc * Update fastdeploy_runtime.cc fix variable option.trt_max_shape wrong name * Update runtime_option.md Update resnet model dynamic shape setting name from images to x * Fix bug when inference result boxes are empty * Delete detection.py Co-authored-by: Jason Co-authored-by: root Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: huangjianhui <852142024@qq.com> Co-authored-by: Jason Co-authored-by: root Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: huangjianhui <852142024@qq.com> --- fastdeploy/utils/utils.h | 4 ++++ fastdeploy/vision/ppcls/model.cc | 6 +++--- fastdeploy/vision/ultralytics/yolov5.cc | 4 ++-- fastdeploy/vision/utils/sort_det_res.cc | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/fastdeploy/utils/utils.h b/fastdeploy/utils/utils.h index e605ee5a75..b57a27f80c 100644 --- a/fastdeploy/utils/utils.h +++ b/fastdeploy/utils/utils.h @@ -69,6 +69,10 @@ class FASTDEPLOY_DECL FDLogger { #define __REL_FILE__ __FILE__ #endif +#define FDERROR \ + FDLogger(true, "[ERROR]") \ + << __REL_FILE__ << "(" << __LINE__ << ")::" << __FUNCTION__ << "\t" + #define FDERROR \ FDLogger(true, "[ERROR]") << __REL_FILE__ << "(" << __LINE__ \ << ")::" << __FUNCTION__ << "\t" diff --git a/fastdeploy/vision/ppcls/model.cc b/fastdeploy/vision/ppcls/model.cc index a89a1e4731..c4e5b767c7 100644 --- a/fastdeploy/vision/ppcls/model.cc +++ b/fastdeploy/vision/ppcls/model.cc @@ -148,6 +148,6 @@ bool Model::Predict(cv::Mat* im, ClassifyResult* result, int topk) { return true; } -} // namespace ppcls -} // namespace vision -} // namespace fastdeploy +} // namespace ppcls +} // namespace vision +} // namespace fastdeploy diff --git a/fastdeploy/vision/ultralytics/yolov5.cc b/fastdeploy/vision/ultralytics/yolov5.cc index b2e6009b1c..0b7e50e735 100644 --- a/fastdeploy/vision/ultralytics/yolov5.cc +++ b/fastdeploy/vision/ultralytics/yolov5.cc @@ -204,9 +204,9 @@ bool YOLOv5::Postprocess( } if (result->boxes.size() == 0) { - return true; + return true; } - + utils::NMS(result, nms_iou_threshold); // scale the boxes to the origin image shape diff --git a/fastdeploy/vision/utils/sort_det_res.cc b/fastdeploy/vision/utils/sort_det_res.cc index 790126a6ac..93dbb69694 100644 --- a/fastdeploy/vision/utils/sort_det_res.cc +++ b/fastdeploy/vision/utils/sort_det_res.cc @@ -70,7 +70,7 @@ void SortDetectionResult(DetectionResult* result) { size_t low = 0; size_t high = result->scores.size(); if (high == 0) { - return; + return; } high = high - 1; MergeSort(result, low, high); From 6ae19c839f66760b8231936f8128d23a3e36d088 Mon Sep 17 00:00:00 2001 From: ziqi-jin <67993288+ziqi-jin@users.noreply.github.com> Date: Wed, 20 Jul 2022 16:46:54 +0800 Subject: [PATCH 02/15] Develop (#13) * Fix compile problem in different python version (#26) * fix some usage problem in linux * Fix compile problem Co-authored-by: root * Add PaddleDetetion/PPYOLOE model support (#22) * add ppdet/ppyoloe * Add demo code and documents * add convert processor to vision (#27) * update .gitignore * Added checking for cmake include dir * fixed missing trt_backend option bug when init from trt * remove un-need data layout and add pre-check for dtype * changed RGB2BRG to BGR2RGB in ppcls model * add model_zoo yolov6 c++/python demo * fixed CMakeLists.txt typos * update yolov6 cpp/README.md * add yolox c++/pybind and model_zoo demo * move some helpers to private * fixed CMakeLists.txt typos * add normalize with alpha and beta * add version notes for yolov5/yolov6/yolox * add copyright to yolov5.cc * revert normalize * fixed some bugs in yolox * fixed examples/CMakeLists.txt to avoid conflicts * add convert processor to vision * format examples/CMakeLists summary * Fix bug while the inference result is empty with YOLOv5 (#29) * Add multi-label function for yolov5 * Update README.md Update doc * Update fastdeploy_runtime.cc fix variable option.trt_max_shape wrong name * Update runtime_option.md Update resnet model dynamic shape setting name from images to x * Fix bug when inference result boxes are empty * Delete detection.py Co-authored-by: Jason Co-authored-by: root Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: huangjianhui <852142024@qq.com> From 083cdb9ad954537fe933921917f37fabd3800812 Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:07:35 +0000 Subject: [PATCH 03/15] documents --- model_zoo/vision/yolor/README.md | 13 +++++++------ model_zoo/vision/yolor/cpp/README.md | 14 +++++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/model_zoo/vision/yolor/README.md b/model_zoo/vision/yolor/README.md index 467023f169..12db50dc92 100644 --- a/model_zoo/vision/yolor/README.md +++ b/model_zoo/vision/yolor/README.md @@ -1,6 +1,7 @@ # 编译YOLOR示例 -当前支持模型版本为：[YOLOR v0.1](https://github.com/WongKinYiu/yolor/releases/tag/weights) +当前支持模型版本为：[YOLOR weights](https://github.com/WongKinYiu/yolor/releases/tag/weights) +tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换(checkout)到 `paper` 分支. 本文档说明如何进行[YOLOR](https://github.com/WongKinYiu/yolor)的快速部署推理。本目录结构如下 @@ -20,17 +21,17 @@ 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。 - - ``` #下载yolor模型文件 - wget https://github.com/WongKinYiu/yolor/releases/download/v0.1/yolor.pt + wget https://github.com/WongKinYiu/yolor/releases/download/weights/yolor-d6-paper-570.pt # 导出onnx格式文件 - python models/export.py --grid --dynamic --weights PATH/TO/yolo7.pt + python models/export.py --weights PATH/TO/yolor-xx-xx-xx.pt --img-size 640 + + # 如果您在导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 # 移动onnx文件到demo目录 - cp PATH/TO/yolo7.onnx PATH/TO/model_zoo/vision/yolor/ + cp PATH/TO/yolor.onnx PATH/TO/model_zoo/vision/yolor/ ``` ## 安装FastDeploy diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index eddf5bc51b..7827ca268d 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -1,20 +1,24 @@ # 编译YOLOR示例 -当前支持模型版本为：[YOLOR v0.1](https://github.com/WongKinYiu/yolor/releases/tag/weights) +当前支持模型版本为：[YOLOR weights](https://github.com/WongKinYiu/yolor/releases/tag/weights) ## 获取ONNX文件 - 手动获取 - 访问[YOLOR](https://github.com/WongKinYiu/yolor/releases/tag/weights)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。 + 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。 ``` #下载yolor模型文件 - wget https://github.com/WongKinYiu/yolor/releases/download/v0.1/yolor.pt + wget https://github.com/WongKinYiu/yolor/releases/download/weights/yolor-d6-paper-570.pt # 导出onnx格式文件 - python models/export.py --grid --dynamic --weights PATH/TO/yolo7.pt + python models/export.py --weights PATH/TO/yolor-xx-xx-xx.pt --img-size 640 + # 如果您在导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 + + # 移动onnx文件到demo目录 + cp PATH/TO/yolor.onnx PATH/TO/model_zoo/vision/yolor/ ``` @@ -31,7 +35,7 @@ cmake .. make -j # 移动onnx文件到demo目录 -cp PATH/TO/yolo7.onnx PATH/TO/model_zoo/vision/yolor/cpp/build/ +cp PATH/TO/yolor.onnx PATH/TO/model_zoo/vision/yolor/cpp/build/ # 下载图片 wget https://raw.githubusercontent.com/WongKinYiu/yolor/paper/inference/images/horses.jpg From 0db57304ddc9142ad41e00e12c092597ab5208b0 Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:09:41 +0000 Subject: [PATCH 04/15] documents --- model_zoo/vision/yolor/cpp/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index 7827ca268d..f2fb220487 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -15,7 +15,7 @@ # 导出onnx格式文件 python models/export.py --weights PATH/TO/yolor-xx-xx-xx.pt --img-size 640 - # 如果您在导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 + # 如果您在导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考 [DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md) 的解决办法 # 移动onnx文件到demo目录 cp PATH/TO/yolor.onnx PATH/TO/model_zoo/vision/yolor/ From ee3db6b1d987bbde4d60e90c2815678e3c97276d Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:10:20 +0000 Subject: [PATCH 05/15] documents --- model_zoo/vision/yolor/cpp/README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index f2fb220487..03fdafe751 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -6,7 +6,7 @@ - 手动获取 - 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。 + 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您在导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 ``` #下载yolor模型文件 @@ -15,8 +15,6 @@ # 导出onnx格式文件 python models/export.py --weights PATH/TO/yolor-xx-xx-xx.pt --img-size 640 - # 如果您在导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考 [DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md) 的解决办法 - # 移动onnx文件到demo目录 cp PATH/TO/yolor.onnx PATH/TO/model_zoo/vision/yolor/ ``` From c19be13414a641f7d44975ee3f3be05831ed1caa Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:10:45 +0000 Subject: [PATCH 06/15] documents --- model_zoo/vision/yolor/cpp/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index 03fdafe751..f6a75b9737 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -6,7 +6,7 @@ - 手动获取 - 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您在导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 + 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 ``` #下载yolor模型文件 From fd8dfea40d4c484ee13c2de155f2ead83ef478f0 Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:12:50 +0000 Subject: [PATCH 07/15] documents --- model_zoo/vision/yolor/README.md | 2 +- model_zoo/vision/yolor/cpp/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model_zoo/vision/yolor/README.md b/model_zoo/vision/yolor/README.md index 12db50dc92..2c54f97e2f 100644 --- a/model_zoo/vision/yolor/README.md +++ b/model_zoo/vision/yolor/README.md @@ -1,7 +1,7 @@ # 编译YOLOR示例 当前支持模型版本为：[YOLOR weights](https://github.com/WongKinYiu/yolor/releases/tag/weights) -tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换(checkout)到 `paper` 分支. +(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换(checkout)到 `paper` 分支). 本文档说明如何进行[YOLOR](https://github.com/WongKinYiu/yolor)的快速部署推理。本目录结构如下 diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index f6a75b9737..587adc4f24 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -1,7 +1,7 @@ # 编译YOLOR示例 当前支持模型版本为：[YOLOR weights](https://github.com/WongKinYiu/yolor/releases/tag/weights) - +(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换(checkout)到 `paper` 分支). ## 获取ONNX文件 - 手动获取 From 3199d2f5ee82c69a900f25b9407ae2d47c929d23 Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:14:31 +0000 Subject: [PATCH 08/15] documents --- model_zoo/vision/yolor/README.md | 2 +- model_zoo/vision/yolor/cpp/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model_zoo/vision/yolor/README.md b/model_zoo/vision/yolor/README.md index 2c54f97e2f..04f871bd8c 100644 --- a/model_zoo/vision/yolor/README.md +++ b/model_zoo/vision/yolor/README.md @@ -1,7 +1,7 @@ # 编译YOLOR示例 当前支持模型版本为：[YOLOR weights](https://github.com/WongKinYiu/yolor/releases/tag/weights) -(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换(checkout)到 `paper` 分支). +(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换`checkout`到 `paper` 分支). 本文档说明如何进行[YOLOR](https://github.com/WongKinYiu/yolor)的快速部署推理。本目录结构如下 diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index 587adc4f24..02c52091a6 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -1,7 +1,7 @@ # 编译YOLOR示例 当前支持模型版本为：[YOLOR weights](https://github.com/WongKinYiu/yolor/releases/tag/weights) -(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换(checkout)到 `paper` 分支). +(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换`checkout`到 `paper` 分支). ## 获取ONNX文件 - 手动获取 From 807045fcfbecfb9394f5c769ae4eb0233b3a5299 Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:15:47 +0000 Subject: [PATCH 09/15] documents --- model_zoo/vision/yolor/README.md | 2 +- model_zoo/vision/yolor/cpp/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model_zoo/vision/yolor/README.md b/model_zoo/vision/yolor/README.md index 04f871bd8c..2c54f97e2f 100644 --- a/model_zoo/vision/yolor/README.md +++ b/model_zoo/vision/yolor/README.md @@ -1,7 +1,7 @@ # 编译YOLOR示例 当前支持模型版本为：[YOLOR weights](https://github.com/WongKinYiu/yolor/releases/tag/weights) -(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换`checkout`到 `paper` 分支). +(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换(checkout)到 `paper` 分支). 本文档说明如何进行[YOLOR](https://github.com/WongKinYiu/yolor)的快速部署推理。本目录结构如下 diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index 02c52091a6..587adc4f24 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -1,7 +1,7 @@ # 编译YOLOR示例 当前支持模型版本为：[YOLOR weights](https://github.com/WongKinYiu/yolor/releases/tag/weights) -(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换`checkout`到 `paper` 分支). +(tips: 如果使用 `git clone` 的方式下载仓库代码，请将分支切换(checkout)到 `paper` 分支). ## 获取ONNX文件 - 手动获取 From 041782637f6381a9f0b12f04922dbd6479118b29 Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:18:27 +0000 Subject: [PATCH 10/15] documents --- model_zoo/vision/yolor/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model_zoo/vision/yolor/README.md b/model_zoo/vision/yolor/README.md index 2c54f97e2f..ec44e82823 100644 --- a/model_zoo/vision/yolor/README.md +++ b/model_zoo/vision/yolor/README.md @@ -19,7 +19,7 @@ - 手动获取 - 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。 + 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 ``` #下载yolor模型文件 From 52e6974b700313e742c4d8d9d7d079376061d41b Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:19:12 +0000 Subject: [PATCH 11/15] documents --- model_zoo/vision/yolor/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/model_zoo/vision/yolor/README.md b/model_zoo/vision/yolor/README.md index ec44e82823..78cc6d796a 100644 --- a/model_zoo/vision/yolor/README.md +++ b/model_zoo/vision/yolor/README.md @@ -28,8 +28,6 @@ # 导出onnx格式文件 python models/export.py --weights PATH/TO/yolor-xx-xx-xx.pt --img-size 640 - # 如果您在导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 - # 移动onnx文件到demo目录 cp PATH/TO/yolor.onnx PATH/TO/model_zoo/vision/yolor/ ``` From 042c388f14528bc5b27cd0b9f32a79946d37fbe0 Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:32:45 +0000 Subject: [PATCH 12/15] documents --- fastdeploy/vision/wongkinyiu/__init__.py | 2 +- model_zoo/vision/yolov7/README.md | 4 ++-- model_zoo/vision/yolov7/cpp/README.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fastdeploy/vision/wongkinyiu/__init__.py b/fastdeploy/vision/wongkinyiu/__init__.py index 026d10062f..3c77e85896 100644 --- a/fastdeploy/vision/wongkinyiu/__init__.py +++ b/fastdeploy/vision/wongkinyiu/__init__.py @@ -135,7 +135,7 @@ def predict(self, input_image, conf_threshold=0.25, nms_iou_threshold=0.5): return self._model.predict(input_image, conf_threshold, nms_iou_threshold) - # 一些跟YOLOv7模型有关的属性封装 + # 一些跟YOLOR模型有关的属性封装 # 多数是预处理相关，可通过修改如model.size = [1280, 1280]改变预处理时resize的大小（前提是模型支持） @property def size(self): diff --git a/model_zoo/vision/yolov7/README.md b/model_zoo/vision/yolov7/README.md index 2bb13ce459..8b2f06d761 100644 --- a/model_zoo/vision/yolov7/README.md +++ b/model_zoo/vision/yolov7/README.md @@ -27,10 +27,10 @@ wget https://github.com/WongKinYiu/yolov7/releases/download/v0.1/yolov7.pt # 导出onnx格式文件 - python models/export.py --grid --dynamic --weights PATH/TO/yolo7.pt + python models/export.py --grid --dynamic --weights PATH/TO/yolov7.pt # 移动onnx文件到demo目录 - cp PATH/TO/yolo7.onnx PATH/TO/model_zoo/vision/yolov7/ + cp PATH/TO/yolov7.onnx PATH/TO/model_zoo/vision/yolov7/ ``` ## 安装FastDeploy diff --git a/model_zoo/vision/yolov7/cpp/README.md b/model_zoo/vision/yolov7/cpp/README.md index f216c1aecf..655e98678c 100644 --- a/model_zoo/vision/yolov7/cpp/README.md +++ b/model_zoo/vision/yolov7/cpp/README.md @@ -13,7 +13,7 @@ wget https://github.com/WongKinYiu/yolov7/releases/download/v0.1/yolov7.pt # 导出onnx格式文件 - python models/export.py --grid --dynamic --weights PATH/TO/yolo7.pt + python models/export.py --grid --dynamic --weights PATH/TO/yolov7.pt ``` @@ -31,7 +31,7 @@ cmake .. make -j # 移动onnx文件到demo目录 -cp PATH/TO/yolo7.onnx PATH/TO/model_zoo/vision/yolov7/cpp/build/ +cp PATH/TO/yolov7.onnx PATH/TO/model_zoo/vision/yolov7/cpp/build/ # 下载图片 wget https://raw.githubusercontent.com/WongKinYiu/yolov7/main/inference/images/horses.jpg From db3bfa2de15e40712562a267750eabe9e62fd4b7 Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 09:40:11 +0000 Subject: [PATCH 13/15] documents --- model_zoo/vision/yolor/README.md | 2 +- model_zoo/vision/yolor/cpp/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model_zoo/vision/yolor/README.md b/model_zoo/vision/yolor/README.md index 78cc6d796a..6212d0a279 100644 --- a/model_zoo/vision/yolor/README.md +++ b/model_zoo/vision/yolor/README.md @@ -19,7 +19,7 @@ - 手动获取 - 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 + 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/WongKinYiu/yolor/issues/32)的解决办法 ``` #下载yolor模型文件 diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index 587adc4f24..b5c62646ee 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -6,7 +6,7 @@ - 手动获取 - 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/DefTruth/lite.ai.toolkit/blob/main/docs/ort/ort_yolor.zh.md)的解决办法 + 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/WongKinYiu/yolor/issues/32)的解决办法 ``` #下载yolor模型文件 From f8058abfa4d719148fb9c2299a6ccc82745b2ece Mon Sep 17 00:00:00 2001 From: ziqi-jin Date: Wed, 20 Jul 2022 11:17:35 +0000 Subject: [PATCH 14/15] documents --- model_zoo/vision/yolor/README.md | 2 +- model_zoo/vision/yolor/cpp/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/model_zoo/vision/yolor/README.md b/model_zoo/vision/yolor/README.md index 6212d0a279..358e62bbe1 100644 --- a/model_zoo/vision/yolor/README.md +++ b/model_zoo/vision/yolor/README.md @@ -19,7 +19,7 @@ - 手动获取 - 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/WongKinYiu/yolor/issues/32)的解决办法 + 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[yolor#32](https://github.com/WongKinYiu/yolor/issues/32)的解决办法 ``` #下载yolor模型文件 diff --git a/model_zoo/vision/yolor/cpp/README.md b/model_zoo/vision/yolor/cpp/README.md index b5c62646ee..d06bbe3005 100644 --- a/model_zoo/vision/yolor/cpp/README.md +++ b/model_zoo/vision/yolor/cpp/README.md @@ -6,7 +6,7 @@ - 手动获取 - 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[@DefTruth](https://github.com/WongKinYiu/yolor/issues/32)的解决办法 + 访问[YOLOR](https://github.com/WongKinYiu/yolor)官方github库，按照指引下载安装，下载`yolor.pt` 模型，利用 `models/export.py` 得到`onnx`格式文件。如果您导出的`onnx`模型出现精度不达标或者是数据维度的问题，可以参考[yolor#32](https://github.com/WongKinYiu/yolor/issues/32)的解决办法 ``` #下载yolor模型文件 From 9121299d6dd8ab8a207f6137f44b0b0e678f1908 Mon Sep 17 00:00:00 2001 From: Jason <928090362@qq.com> Date: Thu, 21 Jul 2022 10:13:28 +0800 Subject: [PATCH 15/15] Develop (#14) * Fix compile problem in different python version (#26) * fix some usage problem in linux * Fix compile problem Co-authored-by: root * Add PaddleDetetion/PPYOLOE model support (#22) * add ppdet/ppyoloe * Add demo code and documents * add convert processor to vision (#27) * update .gitignore * Added checking for cmake include dir * fixed missing trt_backend option bug when init from trt * remove un-need data layout and add pre-check for dtype * changed RGB2BRG to BGR2RGB in ppcls model * add model_zoo yolov6 c++/python demo * fixed CMakeLists.txt typos * update yolov6 cpp/README.md * add yolox c++/pybind and model_zoo demo * move some helpers to private * fixed CMakeLists.txt typos * add normalize with alpha and beta * add version notes for yolov5/yolov6/yolox * add copyright to yolov5.cc * revert normalize * fixed some bugs in yolox * fixed examples/CMakeLists.txt to avoid conflicts * add convert processor to vision * format examples/CMakeLists summary * Fix bug while the inference result is empty with YOLOv5 (#29) * Add multi-label function for yolov5 * Update README.md Update doc * Update fastdeploy_runtime.cc fix variable option.trt_max_shape wrong name * Update runtime_option.md Update resnet model dynamic shape setting name from images to x * Fix bug when inference result boxes are empty * Delete detection.py Co-authored-by: root Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: huangjianhui <852142024@qq.com>