From 7db89e7195c3e96bfdf3a6c1899f60ad43354e17 Mon Sep 17 00:00:00 2001 From: Zhanchao Huang <33946139+Shank2358@users.noreply.github.com> Date: Mon, 20 Feb 2023 19:35:41 +0800 Subject: [PATCH] Update loss_obb.py --- modelR/loss/loss_obb.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modelR/loss/loss_obb.py b/modelR/loss/loss_obb.py index 339bb35..90e3ca4 100644 --- a/modelR/loss/loss_obb.py +++ b/modelR/loss/loss_obb.py @@ -26,17 +26,20 @@ def __init__(self, anchors, strides, iou_threshold_loss=0.5): def forward(self, p, p_d, label_sbbox, label_mbbox, label_lbbox, sbboxes, mbboxes, lbboxes): strides = self.__strides - loss_s, loss_s_iou, loss_s_conf, loss_s_cls = self.__cal_loss_per_layer(p[0], p_d[0], label_sbbox, + loss_s, loss_s_iou, loss_s_conf, loss_s_cls, loss_s_a, loss_s_r, loss_s_s = self.__cal_loss_per_layer(p[0], p_d[0], label_sbbox, sbboxes, strides[0]) - loss_m, loss_m_iou, loss_m_conf, loss_m_cls = self.__cal_loss_per_layer(p[1], p_d[1], label_mbbox, + loss_m, loss_m_iou, loss_m_conf, loss_m_cls, loss_m_a, loss_m_r, loss_m_s = self.__cal_loss_per_layer(p[1], p_d[1], label_mbbox, mbboxes, strides[1]) - loss_l, loss_l_iou, loss_l_conf, loss_l_cls = self.__cal_loss_per_layer(p[2], p_d[2], label_lbbox, + loss_l, loss_l_iou, loss_l_conf, loss_l_cls, loss_l_a, loss_l_r, loss_l_s = self.__cal_loss_per_layer(p[2], p_d[2], label_lbbox, lbboxes, strides[2]) loss = loss_l + loss_m + loss_s loss_iou = loss_s_iou + loss_m_iou + loss_l_iou loss_conf = loss_s_conf + loss_m_conf + loss_l_conf loss_cls = loss_s_cls + loss_m_cls + loss_l_cls - return loss, loss_iou, loss_conf, loss_cls + loss_a = loss_s_a + loss_m_a + loss_l_a + loss_s = loss_s_s + loss_m_s + loss_l_s + loss_r = loss_s_r + loss_m_r + loss_l_r + return loss, loss_iou, loss_conf, loss_cls, loss_a, loss_r, loss_s def smooth_l1_loss(self, input, target, beta=1. / 9, size_average=True): n = torch.abs(input - target)