Integrate offset into grid (#7262)
Browse filesEliminate 1 op during training and inference.
- models/yolo.py +3 -3
models/yolo.py
CHANGED
@@ -64,11 +64,11 @@ class Detect(nn.Module):
|
|
64 |
|
65 |
y = x[i].sigmoid()
|
66 |
if self.inplace:
|
67 |
-
y[..., 0:2] = (y[..., 0:2] * 2
|
68 |
y[..., 2:4] = (y[..., 2:4] * 2) ** 2 * self.anchor_grid[i] # wh
|
69 |
else: # for YOLOv5 on AWS Inferentia https://github.com/ultralytics/yolov5/pull/2953
|
70 |
xy, wh, conf = y.split((2, 2, self.nc + 1), 4) # y.tensor_split((2, 4, 5), 4) # torch 1.8.0
|
71 |
-
xy = (xy * 2 +
|
72 |
wh = (wh * 2) ** 2 * self.anchor_grid[i] # wh
|
73 |
y = torch.cat((xy, wh, conf), 4)
|
74 |
z.append(y.view(bs, -1, self.no))
|
@@ -82,7 +82,7 @@ class Detect(nn.Module):
|
|
82 |
yv, xv = torch.meshgrid(torch.arange(ny, device=d), torch.arange(nx, device=d), indexing='ij')
|
83 |
else:
|
84 |
yv, xv = torch.meshgrid(torch.arange(ny, device=d), torch.arange(nx, device=d))
|
85 |
-
grid = torch.stack((xv, yv), 2).expand(shape).float()
|
86 |
anchor_grid = (self.anchors[i] * self.stride[i]).view((1, self.na, 1, 1, 2)).expand(shape).float()
|
87 |
return grid, anchor_grid
|
88 |
|
|
|
64 |
|
65 |
y = x[i].sigmoid()
|
66 |
if self.inplace:
|
67 |
+
y[..., 0:2] = (y[..., 0:2] * 2 + self.grid[i]) * self.stride[i] # xy
|
68 |
y[..., 2:4] = (y[..., 2:4] * 2) ** 2 * self.anchor_grid[i] # wh
|
69 |
else: # for YOLOv5 on AWS Inferentia https://github.com/ultralytics/yolov5/pull/2953
|
70 |
xy, wh, conf = y.split((2, 2, self.nc + 1), 4) # y.tensor_split((2, 4, 5), 4) # torch 1.8.0
|
71 |
+
xy = (xy * 2 + self.grid[i]) * self.stride[i] # xy
|
72 |
wh = (wh * 2) ** 2 * self.anchor_grid[i] # wh
|
73 |
y = torch.cat((xy, wh, conf), 4)
|
74 |
z.append(y.view(bs, -1, self.no))
|
|
|
82 |
yv, xv = torch.meshgrid(torch.arange(ny, device=d), torch.arange(nx, device=d), indexing='ij')
|
83 |
else:
|
84 |
yv, xv = torch.meshgrid(torch.arange(ny, device=d), torch.arange(nx, device=d))
|
85 |
+
grid = torch.stack((xv, yv), 2).expand(shape).float() - 0.5 # add grid offset, i.e. y = 2.0 * x - 0.5
|
86 |
anchor_grid = (self.anchors[i] * self.stride[i]).view((1, self.na, 1, 1, 2)).expand(shape).float()
|
87 |
return grid, anchor_grid
|
88 |
|