From ba6762869a4d28549bc4d719b73131bbe9bc2b53 Mon Sep 17 00:00:00 2001 From: jiangjiajun Date: Wed, 27 Jul 2022 09:36:34 +0000 Subject: [PATCH 1/2] Fix bug in ppyoloe --- csrcs/fastdeploy/vision/ppdet/ppyoloe.cc | 4 ++-- setup.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/csrcs/fastdeploy/vision/ppdet/ppyoloe.cc b/csrcs/fastdeploy/vision/ppdet/ppyoloe.cc index 08c4073f297..b2d3582c456 100644 --- a/csrcs/fastdeploy/vision/ppdet/ppyoloe.cc +++ b/csrcs/fastdeploy/vision/ppdet/ppyoloe.cc @@ -130,8 +130,8 @@ bool PPYOLOE::Preprocess(Mat* mat, std::vector* outputs) { (*outputs)[1].Allocate({1, 2}, FDDataType::FP32, InputInfoOfRuntime(1).name); float* ptr = static_cast((*outputs)[1].MutableData()); - ptr[0] = mat->Height() * 1.0 / mat->Height(); - ptr[1] = mat->Width() * 1.0 / mat->Width(); + ptr[0] = mat->Height() * 1.0 / origin_h; + ptr[1] = mat->Width() * 1.0 / origin_w; return true; } diff --git a/setup.py b/setup.py index 8575c42963d..7c549fe604f 100644 --- a/setup.py +++ b/setup.py @@ -52,6 +52,8 @@ setup_configs["TRT_DIRECTORY"] = os.getenv("TRT_DIRECTORY", "UNDEFINED") setup_configs["CUDA_DIRECTORY"] = os.getenv("CUDA_DIRECTORY", "/usr/local/cuda") +if os.getenv("CMAKE_CXX_COMPILER", None) is not None: + setup_configs["CMAKE_CXX_COMPILER"] = os.getenv("CMAKE_CXX_COMPILER") TOP_DIR = os.path.realpath(os.path.dirname(__file__)) SRC_DIR = os.path.join(TOP_DIR, "fastdeploy") From 799bd013564df5b6690c1bc6869f0b919db6a263 Mon Sep 17 00:00:00 2001 From: jiangjiajun Date: Thu, 28 Jul 2022 02:17:33 +0000 Subject: [PATCH 2/2] fix ppyoloe output format --- csrcs/fastdeploy/vision/ppdet/ppyoloe.cc | 6 ++---- model_zoo/vision/ppyoloe/ppyoloe.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/csrcs/fastdeploy/vision/ppdet/ppyoloe.cc b/csrcs/fastdeploy/vision/ppdet/ppyoloe.cc index b2d3582c456..9c698976e0a 100644 --- a/csrcs/fastdeploy/vision/ppdet/ppyoloe.cc +++ b/csrcs/fastdeploy/vision/ppdet/ppyoloe.cc @@ -176,8 +176,7 @@ bool PPYOLOE::Postprocess(std::vector& infer_result, result->scores.push_back(nms.out_box_data[i * 6 + 1]); result->boxes.emplace_back(std::array{ nms.out_box_data[i * 6 + 2], nms.out_box_data[i * 6 + 3], - nms.out_box_data[i * 6 + 4] - nms.out_box_data[i * 6 + 2], - nms.out_box_data[i * 6 + 5] - nms.out_box_data[i * 6 + 3]}); + nms.out_box_data[i * 6 + 4], nms.out_box_data[i * 6 + 5]}); } } else { int box_num = 0; @@ -197,8 +196,7 @@ bool PPYOLOE::Postprocess(std::vector& infer_result, result->scores.push_back(box_data[i * 6 + 1]); result->boxes.emplace_back( std::array{box_data[i * 6 + 2], box_data[i * 6 + 3], - box_data[i * 6 + 4] - box_data[i * 6 + 2], - box_data[i * 6 + 5] - box_data[i * 6 + 3]}); + box_data[i * 6 + 4], box_data[i * 6 + 5]}); } } return true; diff --git a/model_zoo/vision/ppyoloe/ppyoloe.py b/model_zoo/vision/ppyoloe/ppyoloe.py index 7d79dfd8cf7..a3b12c1dc6b 100644 --- a/model_zoo/vision/ppyoloe/ppyoloe.py +++ b/model_zoo/vision/ppyoloe/ppyoloe.py @@ -14,7 +14,7 @@ # 预测图片 im = cv2.imread("000000014439_640x640.jpg") -result = model.predict(im, conf_threshold=0.5) +result = model.predict(im) # 可视化结果 fd.vision.visualize.vis_detection(im, result)