From 975ef03f84868f848d8be62e97719d4ebc82c11f Mon Sep 17 00:00:00 2001 From: wa22 Date: Tue, 4 Jun 2024 19:15:37 +0800 Subject: [PATCH] resolve conflict --- ultralytics/models/yolov10/val.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ultralytics/models/yolov10/val.py b/ultralytics/models/yolov10/val.py index 77450b44..19a019c8 100644 --- a/ultralytics/models/yolov10/val.py +++ b/ultralytics/models/yolov10/val.py @@ -14,12 +14,11 @@ class YOLOv10DetectionValidator(DetectionValidator): if isinstance(preds, (list, tuple)): preds = preds[0] + # Acknowledgement: Thanks to sanha9999 in #190 and #181! if preds.shape[-1] == 6: - pass + return preds else: preds = preds.transpose(-1, -2) - bboxes, scores, labels = ops.v10postprocess(preds, self.args.max_det, preds.shape[-1]-4) - bboxes = ops.xywh2xyxy(bboxes) - preds = torch.cat([bboxes, scores.unsqueeze(-1), labels.unsqueeze(-1)], dim=-1) - - return preds + boxes, scores, labels = ops.v10postprocess(preds, self.args.max_det, self.nc) + bboxes = ops.xywh2xyxy(boxes) + return torch.cat([bboxes, scores.unsqueeze(-1), labels.unsqueeze(-1)], dim=-1) \ No newline at end of file