Chiebot-Mirror
/
YOLOv8-TensorRT
mirror of https://github.com/triple-Mu/YOLOv8-TensorRT.git
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the condition if masks are empty

Browse Source
pull/72/head
liang-zijian 2 years ago
parent 7d0f5173e7
commit d967ae6ae8
3 changed files with 93 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      csrc/jetson/segment/include/yolov8-seg.hpp
  2. 55
      csrc/segment/normal/include/yolov8-seg.hpp
  3. 56
      csrc/segment/simple/include/yolov8-seg.hpp

57
csrc/jetson/segment/include/yolov8-seg.hpp
Unescape View File

@ -428,36 +428,41 @@ void YOLOv8_seg::postprocess(std::vector<Object>& objs,
objs.push_back(obj); objs.push_back(obj);
cnt += 1; cnt += 1;
} }
if(masks.empty())
{
//masks is empty
}
else
{
cv::Mat matmulRes = (masks * protos).t();
cv::Mat maskMat = matmulRes.reshape(indices.size(), { seg_w, seg_h });
cv::Mat matmulRes = (masks * protos).t(); std::vector<cv::Mat> maskChannels;
cv::Mat maskMat = matmulRes.reshape(indices.size(), { seg_w, seg_h }); cv::split(maskMat, maskChannels);
int scale_dw = dw / input_w * seg_w;
std::vector<cv::Mat> maskChannels; int scale_dh = dh / input_h * seg_h;
cv::split(maskMat, maskChannels);
int scale_dw = dw / input_w * seg_w;
int scale_dh = dh / input_h * seg_h;
cv::Rect roi( cv::Rect roi(
scale_dw, scale_dw,
scale_dh, scale_dh,
seg_w - 2 * scale_dw, seg_w - 2 * scale_dw,
seg_h - 2 * scale_dh); seg_h - 2 * scale_dh);
for (int i = 0; i < indices.size(); i++) for (int i = 0; i < indices.size(); i++)
{ {
cv::Mat dest, mask; cv::Mat dest, mask;
cv::exp(-maskChannels[i], dest); cv::exp(-maskChannels[i], dest);
dest = 1.0 / (1.0 + dest); dest = 1.0 / (1.0 + dest);
dest = dest(roi); dest = dest(roi);
cv::resize( cv::resize(
dest, dest,
mask, mask,
cv::Size((int)width, (int)height), cv::Size((int)width, (int)height),
cv::INTER_LINEAR cv::INTER_LINEAR
); );
objs[i].boxMask = mask(objs[i].rect) > 0.5f; objs[i].boxMask = mask(objs[i].rect) > 0.5f;
}
} }
} }
void YOLOv8_seg::draw_objects(const cv::Mat& image, void YOLOv8_seg::draw_objects(const cv::Mat& image,

55
csrc/segment/normal/include/yolov8-seg.hpp
Unescape View File

@ -459,33 +459,40 @@ void YOLOv8_seg::postprocess(std::vector<Object>& objs,
cnt += 1; cnt += 1;
} }
cv::Mat matmulRes = (masks * protos).t(); if(masks.empty())
cv::Mat maskMat = matmulRes.reshape(indices.size(), { seg_w, seg_h }); {
//masks is empty
}
else
{
cv::Mat matmulRes = (masks * protos).t();
cv::Mat maskMat = matmulRes.reshape(indices.size(), { seg_w, seg_h });
std::vector<cv::Mat> maskChannels; std::vector<cv::Mat> maskChannels;
cv::split(maskMat, maskChannels); cv::split(maskMat, maskChannels);
int scale_dw = dw / input_w * seg_w; int scale_dw = dw / input_w * seg_w;
int scale_dh = dh / input_h * seg_h; int scale_dh = dh / input_h * seg_h;
cv::Rect roi( cv::Rect roi(
scale_dw, scale_dw,
scale_dh, scale_dh,
seg_w - 2 * scale_dw, seg_w - 2 * scale_dw,
seg_h - 2 * scale_dh); seg_h - 2 * scale_dh);
for (int i = 0; i < indices.size(); i++) for (int i = 0; i < indices.size(); i++)
{ {
cv::Mat dest, mask; cv::Mat dest, mask;
cv::exp(-maskChannels[i], dest); cv::exp(-maskChannels[i], dest);
dest = 1.0 / (1.0 + dest); dest = 1.0 / (1.0 + dest);
dest = dest(roi); dest = dest(roi);
cv::resize( cv::resize(
dest, dest,
mask, mask,
cv::Size((int)width, (int)height), cv::Size((int)width, (int)height),
cv::INTER_LINEAR cv::INTER_LINEAR
); );
objs[i].boxMask = mask(objs[i].rect) > 0.5f; objs[i].boxMask = mask(objs[i].rect) > 0.5f;
}
} }
} }

56
csrc/segment/simple/include/yolov8-seg.hpp
Unescape View File

@ -431,35 +431,41 @@ void YOLOv8_seg::postprocess(std::vector<Object>& objs,
cnt += 1; cnt += 1;
} }
cv::Mat matmulRes = (masks * protos).t(); if(masks.empty())
cv::Mat maskMat = matmulRes.reshape(indices.size(), { seg_w, seg_h }); {
//masks is empty
}
else
{
cv::Mat matmulRes = (masks * protos).t();
cv::Mat maskMat = matmulRes.reshape(indices.size(), { seg_w, seg_h });
std::vector<cv::Mat> maskChannels; std::vector<cv::Mat> maskChannels;
cv::split(maskMat, maskChannels); cv::split(maskMat, maskChannels);
int scale_dw = dw / input_w * seg_w; int scale_dw = dw / input_w * seg_w;
int scale_dh = dh / input_h * seg_h; int scale_dh = dh / input_h * seg_h;
cv::Rect roi( cv::Rect roi(
scale_dw, scale_dw,
scale_dh, scale_dh,
seg_w - 2 * scale_dw, seg_w - 2 * scale_dw,
seg_h - 2 * scale_dh); seg_h - 2 * scale_dh);
for (int i = 0; i < indices.size(); i++) for (int i = 0; i < indices.size(); i++)
{ {
cv::Mat dest, mask; cv::Mat dest, mask;
cv::exp(-maskChannels[i], dest); cv::exp(-maskChannels[i], dest);
dest = 1.0 / (1.0 + dest); dest = 1.0 / (1.0 + dest);
dest = dest(roi); dest = dest(roi);
cv::resize( cv::resize(
dest, dest,
mask, mask,
cv::Size((int)width, (int)height), cv::Size((int)width, (int)height),
cv::INTER_LINEAR cv::INTER_LINEAR
); );
objs[i].boxMask = mask(objs[i].rect) > 0.5f; objs[i].boxMask = mask(objs[i].rect) > 0.5f;
}
} }
} }
void YOLOv8_seg::draw_objects(const cv::Mat& image, void YOLOv8_seg::draw_objects(const cv::Mat& image,

Write Preview
Loading…
Cancel
Save