From edc79913a3e339700a43687c7d64f4ba5ac0db26 Mon Sep 17 00:00:00 2001 From: ZoomZoneZero <15280880088@163.com> Date: Fri, 3 Apr 2026 13:46:27 +0800 Subject: [PATCH] Fix AAttn: resolve shape mismatches and crashes when dim is not divisible by `num_heads` (#24114) Signed-off-by: ZoomZoneZero <15280880088@163.com> Co-authored-by: Laughing-q <1185102784@qq.com> --- ultralytics/nn/modules/block.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ultralytics/nn/modules/block.py b/ultralytics/nn/modules/block.py index 20d1734e..43004043 100644 --- a/ultralytics/nn/modules/block.py +++ b/ultralytics/nn/modules/block.py @@ -1676,11 +1676,11 @@ class AAttn(nn.Module): self.num_heads = num_heads self.head_dim = head_dim = dim // num_heads - all_head_dim = head_dim * self.num_heads + self.all_head_dim = all_head_dim = head_dim * self.num_heads self.qkv = Conv(dim, all_head_dim * 3, 1, act=False) self.proj = Conv(all_head_dim, dim, 1, act=False) - self.pe = Conv(all_head_dim, dim, 7, 1, 3, g=dim, act=False) + self.pe = Conv(all_head_dim, all_head_dim, 7, 1, 3, g=all_head_dim, act=False) def forward(self, x: torch.Tensor) -> torch.Tensor: """Process the input tensor through the area-attention. @@ -1691,12 +1691,12 @@ class AAttn(nn.Module): Returns: (torch.Tensor): Output tensor after area-attention. """ - B, C, H, W = x.shape + B, _, H, W = x.shape N = H * W qkv = self.qkv(x).flatten(2).transpose(1, 2) if self.area > 1: - qkv = qkv.reshape(B * self.area, N // self.area, C * 3) + qkv = qkv.reshape(B * self.area, N // self.area, self.all_head_dim * 3) B, N, _ = qkv.shape q, k, v = ( qkv.view(B, N, self.num_heads, self.head_dim * 3) @@ -1710,12 +1710,12 @@ class AAttn(nn.Module): v = v.permute(0, 3, 1, 2) if self.area > 1: - x = x.reshape(B // self.area, N * self.area, C) - v = v.reshape(B // self.area, N * self.area, C) + x = x.reshape(B // self.area, N * self.area, self.all_head_dim) + v = v.reshape(B // self.area, N * self.area, self.all_head_dim) B, N, _ = x.shape - x = x.reshape(B, H, W, C).permute(0, 3, 1, 2).contiguous() - v = v.reshape(B, H, W, C).permute(0, 3, 1, 2).contiguous() + x = x.reshape(B, H, W, self.all_head_dim).permute(0, 3, 1, 2).contiguous() + v = v.reshape(B, H, W, self.all_head_dim).permute(0, 3, 1, 2).contiguous() x = x + self.pe(v) return self.proj(x)