Skip to content

Commit 0cdc250

Browse files
glenn-jocherglenn-jocher
authored
Update models/hub/*.yaml files for v6.0n release (ultralytics#5540)
* Update model yamls for v6.0 * Add python models/yolo.py --test * Ghost fix
1 parent 0275639 commit 0cdc250

File tree

9 files changed

+72
-63
lines changed

9 files changed

+72
-63
lines changed

‎models/hub/yolov5-bifpn.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ anchors:
99
- [30,61, 62,45, 59,119] # P4/16
1010
- [116,90, 156,198, 373,326] # P5/32
1111

12-
# YOLOv5 backbone
12+
# YOLOv5 v6.0 backbone
1313
backbone:
1414
# [from, number, module, args]
15-
[[-1, 1, Focus, [64, 3]], # 0-P1/2
15+
[[-1, 1, Conv, [64, 6, 2, 2]], # 0-P1/2
1616
[-1, 1, Conv, [128, 3, 2]], # 1-P2/4
1717
[-1, 3, C3, [128]],
1818
[-1, 1, Conv, [256, 3, 2]], # 3-P3/8
19-
[-1, 9, C3, [256]],
19+
[-1, 6, C3, [256]],
2020
[-1, 1, Conv, [512, 3, 2]], # 5-P4/16
2121
[-1, 9, C3, [512]],
2222
[-1, 1, Conv, [1024, 3, 2]], # 7-P5/32
23-
[-1, 1, SPP, [1024, [5, 9, 13]]],
24-
[-1, 3, C3, [1024, False]], # 9
23+
[-1, 3, C3, [1024]],
24+
[-1, 1, SPPF, [1024, 5]], # 9
2525
]
2626

27-
# YOLOv5 BiFPN head
27+
# YOLOv5 v6.0 BiFPN head
2828
head:
2929
[[-1, 1, Conv, [512, 1, 1]],
3030
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
@@ -37,7 +37,7 @@ head:
3737
[-1, 3, C3, [256, False]], # 17 (P3/8-small)
3838

3939
[-1, 1, Conv, [256, 3, 2]],
40-
[[-1, 14, 6], 1, Concat, [1]], # cat P4
40+
[[-1, 14, 6], 1, Concat, [1]], # cat P4 <--- BiFPN change
4141
[-1, 3, C3, [512, False]], # 20 (P4/16-medium)
4242

4343
[-1, 1, Conv, [512, 3, 2]],

‎models/hub/yolov5-fpn.yaml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,34 @@ anchors:
99
- [30,61, 62,45, 59,119] # P4/16
1010
- [116,90, 156,198, 373,326] # P5/32
1111

12-
# YOLOv5 backbone
12+
# YOLOv5 v6.0 backbone
1313
backbone:
1414
# [from, number, module, args]
15-
[[-1, 1, Focus, [64, 3]], # 0-P1/2
15+
[[-1, 1, Conv, [64, 6, 2, 2]], # 0-P1/2
1616
[-1, 1, Conv, [128, 3, 2]], # 1-P2/4
17-
[-1, 3, Bottleneck, [128]],
17+
[-1, 3, C3, [128]],
1818
[-1, 1, Conv, [256, 3, 2]], # 3-P3/8
19-
[-1, 9, BottleneckCSP, [256]],
19+
[-1, 6, C3, [256]],
2020
[-1, 1, Conv, [512, 3, 2]], # 5-P4/16
21-
[-1, 9, BottleneckCSP, [512]],
21+
[-1, 9, C3, [512]],
2222
[-1, 1, Conv, [1024, 3, 2]], # 7-P5/32
23-
[-1, 1, SPP, [1024, [5, 9, 13]]],
24-
[-1, 6, BottleneckCSP, [1024]], # 9
23+
[-1, 3, C3, [1024]],
24+
[-1, 1, SPPF, [1024, 5]], # 9
2525
]
2626

27-
# YOLOv5 FPN head
27+
# YOLOv5 v6.0 FPN head
2828
head:
29-
[[-1, 3, BottleneckCSP, [1024, False]], # 10 (P5/32-large)
29+
[[-1, 3, C3, [1024, False]], # 10 (P5/32-large)
3030

3131
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
3232
[[-1, 6], 1, Concat, [1]], # cat backbone P4
3333
[-1, 1, Conv, [512, 1, 1]],
34-
[-1, 3, BottleneckCSP, [512, False]], # 14 (P4/16-medium)
34+
[-1, 3, C3, [512, False]], # 14 (P4/16-medium)
3535

3636
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
3737
[[-1, 4], 1, Concat, [1]], # cat backbone P3
3838
[-1, 1, Conv, [256, 1, 1]],
39-
[-1, 3, BottleneckCSP, [256, False]], # 18 (P3/8-small)
39+
[-1, 3, C3, [256, False]], # 18 (P3/8-small)
4040

4141
[[18, 14, 10], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5)
4242
]

‎models/hub/yolov5-p2.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
nc: 80 # number of classes
55
depth_multiple: 1.0 # model depth multiple
66
width_multiple: 1.0 # layer channel multiple
7-
anchors: 3
7+
anchors: 3 # auto-anchor evolves 3 anchors per P output layer
88

9-
# YOLOv5 backbone
9+
# YOLOv5 v6.0 backbone
1010
backbone:
1111
# [from, number, module, args]
12-
[[-1, 1, Focus, [64, 3]], # 0-P1/2
12+
[[-1, 1, Conv, [64, 6, 2, 2]], # 0-P1/2
1313
[-1, 1, Conv, [128, 3, 2]], # 1-P2/4
1414
[-1, 3, C3, [128]],
1515
[-1, 1, Conv, [256, 3, 2]], # 3-P3/8
16-
[-1, 9, C3, [256]],
16+
[-1, 6, C3, [256]],
1717
[-1, 1, Conv, [512, 3, 2]], # 5-P4/16
1818
[-1, 9, C3, [512]],
1919
[-1, 1, Conv, [1024, 3, 2]], # 7-P5/32
20-
[-1, 1, SPP, [1024, [5, 9, 13]]],
21-
[-1, 3, C3, [1024, False]], # 9
20+
[-1, 3, C3, [1024]],
21+
[-1, 1, SPPF, [1024, 5]], # 9
2222
]
2323

24-
# YOLOv5 head
24+
# YOLOv5 v6.0 head
2525
head:
2626
[[-1, 1, Conv, [512, 1, 1]],
2727
[-1, 1, nn.Upsample, [None, 2, 'nearest']],

‎models/hub/yolov5-p6.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,26 @@
44
nc: 80 # number of classes
55
depth_multiple: 1.0 # model depth multiple
66
width_multiple: 1.0 # layer channel multiple
7-
anchors: 3
7+
anchors: 3 # auto-anchor 3 anchors per P output layer
88

9-
# YOLOv5 backbone
9+
# YOLOv5 v6.0 backbone
1010
backbone:
1111
# [from, number, module, args]
12-
[[-1, 1, Focus, [64, 3]], # 0-P1/2
12+
[[-1, 1, Conv, [64, 6, 2, 2]], # 0-P1/2
1313
[-1, 1, Conv, [128, 3, 2]], # 1-P2/4
1414
[-1, 3, C3, [128]],
1515
[-1, 1, Conv, [256, 3, 2]], # 3-P3/8
16-
[-1, 9, C3, [256]],
16+
[-1, 6, C3, [256]],
1717
[-1, 1, Conv, [512, 3, 2]], # 5-P4/16
1818
[-1, 9, C3, [512]],
1919
[-1, 1, Conv, [768, 3, 2]], # 7-P5/32
2020
[-1, 3, C3, [768]],
2121
[-1, 1, Conv, [1024, 3, 2]], # 9-P6/64
22-
[-1, 1, SPP, [1024, [3, 5, 7]]],
23-
[-1, 3, C3, [1024, False]], # 11
22+
[-1, 3, C3, [1024]],
23+
[-1, 1, SPPF, [1024, 5]], # 11
2424
]
2525

26-
# YOLOv5 head
26+
# YOLOv5 v6.0 head
2727
head:
2828
[[-1, 1, Conv, [768, 1, 1]],
2929
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
@@ -50,7 +50,7 @@ head:
5050

5151
[-1, 1, Conv, [768, 3, 2]],
5252
[[-1, 12], 1, Concat, [1]], # cat head P6
53-
[-1, 3, C3, [1024, False]], # 32 (P5/64-xlarge)
53+
[-1, 3, C3, [1024, False]], # 32 (P6/64-xlarge)
5454

5555
[[23, 26, 29, 32], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5, P6)
5656
]

‎models/hub/yolov5-p7.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
nc: 80 # number of classes
55
depth_multiple: 1.0 # model depth multiple
66
width_multiple: 1.0 # layer channel multiple
7-
anchors: 3
7+
anchors: 3 # auto-anchor 3 anchors per P output layer
88

9-
# YOLOv5 backbone
9+
# YOLOv5 v6.0 backbone
1010
backbone:
1111
# [from, number, module, args]
12-
[[-1, 1, Focus, [64, 3]], # 0-P1/2
12+
[[-1, 1, Conv, [64, 6, 2, 2]], # 0-P1/2
1313
[-1, 1, Conv, [128, 3, 2]], # 1-P2/4
1414
[-1, 3, C3, [128]],
1515
[-1, 1, Conv, [256, 3, 2]], # 3-P3/8
16-
[-1, 9, C3, [256]],
16+
[-1, 6, C3, [256]],
1717
[-1, 1, Conv, [512, 3, 2]], # 5-P4/16
1818
[-1, 9, C3, [512]],
1919
[-1, 1, Conv, [768, 3, 2]], # 7-P5/32
2020
[-1, 3, C3, [768]],
2121
[-1, 1, Conv, [1024, 3, 2]], # 9-P6/64
2222
[-1, 3, C3, [1024]],
2323
[-1, 1, Conv, [1280, 3, 2]], # 11-P7/128
24-
[-1, 1, SPP, [1280, [3, 5]]],
25-
[-1, 3, C3, [1280, False]], # 13
24+
[-1, 3, C3, [1280]],
25+
[-1, 1, SPPF, [1280, 5]], # 13
2626
]
2727

2828
# YOLOv5 head

‎models/hub/yolov5-panet.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,40 @@ anchors:
99
- [30,61, 62,45, 59,119] # P4/16
1010
- [116,90, 156,198, 373,326] # P5/32
1111

12-
# YOLOv5 backbone
12+
# YOLOv5 v6.0 backbone
1313
backbone:
1414
# [from, number, module, args]
15-
[[-1, 1, Focus, [64, 3]], # 0-P1/2
15+
[[-1, 1, Conv, [64, 6, 2, 2]], # 0-P1/2
1616
[-1, 1, Conv, [128, 3, 2]], # 1-P2/4
17-
[-1, 3, BottleneckCSP, [128]],
17+
[-1, 3, C3, [128]],
1818
[-1, 1, Conv, [256, 3, 2]], # 3-P3/8
19-
[-1, 9, BottleneckCSP, [256]],
19+
[-1, 6, C3, [256]],
2020
[-1, 1, Conv, [512, 3, 2]], # 5-P4/16
21-
[-1, 9, BottleneckCSP, [512]],
21+
[-1, 9, C3, [512]],
2222
[-1, 1, Conv, [1024, 3, 2]], # 7-P5/32
23-
[-1, 1, SPP, [1024, [5, 9, 13]]],
24-
[-1, 3, BottleneckCSP, [1024, False]], # 9
23+
[-1, 3, C3, [1024]],
24+
[-1, 1, SPPF, [1024, 5]], # 9
2525
]
2626

27-
# YOLOv5 PANet head
27+
# YOLOv5 v6.0 PANet head
2828
head:
2929
[[-1, 1, Conv, [512, 1, 1]],
3030
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
3131
[[-1, 6], 1, Concat, [1]], # cat backbone P4
32-
[-1, 3, BottleneckCSP, [512, False]], # 13
32+
[-1, 3, C3, [512, False]], # 13
3333

3434
[-1, 1, Conv, [256, 1, 1]],
3535
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
3636
[[-1, 4], 1, Concat, [1]], # cat backbone P3
37-
[-1, 3, BottleneckCSP, [256, False]], # 17 (P3/8-small)
37+
[-1, 3, C3, [256, False]], # 17 (P3/8-small)
3838

3939
[-1, 1, Conv, [256, 3, 2]],
4040
[[-1, 14], 1, Concat, [1]], # cat head P4
41-
[-1, 3, BottleneckCSP, [512, False]], # 20 (P4/16-medium)
41+
[-1, 3, C3, [512, False]], # 20 (P4/16-medium)
4242

4343
[-1, 1, Conv, [512, 3, 2]],
4444
[[-1, 10], 1, Concat, [1]], # cat head P5
45-
[-1, 3, BottleneckCSP, [1024, False]], # 23 (P5/32-large)
45+
[-1, 3, C3, [1024, False]], # 23 (P5/32-large)
4646

4747
[[17, 20, 23], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5)
4848
]

‎models/hub/yolov5s-ghost.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ anchors:
99
- [30,61, 62,45, 59,119] # P4/16
1010
- [116,90, 156,198, 373,326] # P5/32
1111

12-
# YOLOv5 backbone
12+
# YOLOv5 v6.0 backbone
1313
backbone:
1414
# [from, number, module, args]
15-
[[-1, 1, Focus, [64, 3]], # 0-P1/2
15+
[[-1, 1, Conv, [64, 6, 2, 2]], # 0-P1/2
1616
[-1, 1, GhostConv, [128, 3, 2]], # 1-P2/4
1717
[-1, 3, C3Ghost, [128]],
1818
[-1, 1, GhostConv, [256, 3, 2]], # 3-P3/8
19-
[-1, 9, C3Ghost, [256]],
19+
[-1, 6, C3Ghost, [256]],
2020
[-1, 1, GhostConv, [512, 3, 2]], # 5-P4/16
2121
[-1, 9, C3Ghost, [512]],
2222
[-1, 1, GhostConv, [1024, 3, 2]], # 7-P5/32
23-
[-1, 1, SPP, [1024, [5, 9, 13]]],
24-
[-1, 3, C3Ghost, [1024, False]], # 9
23+
[-1, 3, C3Ghost, [1024]],
24+
[-1, 1, SPPF, [1024, 5]], # 9
2525
]
2626

27-
# YOLOv5 head
27+
# YOLOv5 v6.0 head
2828
head:
2929
[[-1, 1, GhostConv, [512, 1, 1]],
3030
[-1, 1, nn.Upsample, [None, 2, 'nearest']],

‎models/hub/yolov5s-transformer.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ anchors:
99
- [30,61, 62,45, 59,119] # P4/16
1010
- [116,90, 156,198, 373,326] # P5/32
1111

12-
# YOLOv5 backbone
12+
# YOLOv5 v6.0 backbone
1313
backbone:
1414
# [from, number, module, args]
15-
[[-1, 1, Focus, [64, 3]], # 0-P1/2
15+
[[-1, 1, Conv, [64, 6, 2, 2]], # 0-P1/2
1616
[-1, 1, Conv, [128, 3, 2]], # 1-P2/4
1717
[-1, 3, C3, [128]],
1818
[-1, 1, Conv, [256, 3, 2]], # 3-P3/8
19-
[-1, 9, C3, [256]],
19+
[-1, 6, C3, [256]],
2020
[-1, 1, Conv, [512, 3, 2]], # 5-P4/16
2121
[-1, 9, C3, [512]],
2222
[-1, 1, Conv, [1024, 3, 2]], # 7-P5/32
23-
[-1, 1, SPP, [1024, [5, 9, 13]]],
24-
[-1, 3, C3TR, [1024, False]], # 9 <-------- C3TR() Transformer module
23+
[-1, 3, C3TR, [1024]], # 9 <--- C3TR() Transformer module
24+
[-1, 1, SPPF, [1024, 5]], # 9
2525
]
2626

27-
# YOLOv5 head
27+
# YOLOv5 v6.0 head
2828
head:
2929
[[-1, 1, Conv, [512, 1, 1]],
3030
[-1, 1, nn.Upsample, [None, 2, 'nearest']],

‎models/yolo.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ def parse_model(d, ch): # model_dict, input_channels(3)
306306
parser.add_argument('--cfg', type=str, default='yolov5s.yaml', help='model.yaml')
307307
parser.add_argument('--device', default='', help='cuda device, i.e. 0 or 0,1,2,3 or cpu')
308308
parser.add_argument('--profile', action='store_true', help='profile model speed')
309+
parser.add_argument('--test', action='store_true', help='test all yolo*.yaml')
309310
opt = parser.parse_args()
310311
opt.cfg = check_yaml(opt.cfg) # check YAML
311312
print_args(FILE.stem, opt)
@@ -320,6 +321,14 @@ def parse_model(d, ch): # model_dict, input_channels(3)
320321
img = torch.rand(8 if torch.cuda.is_available() else 1, 3, 640, 640).to(device)
321322
y = model(img, profile=True)
322323

324+
# Test all models
325+
if opt.test:
326+
for cfg in Path(ROOT / 'models').rglob('yolo*.yaml'):
327+
try:
328+
_ = Model(cfg)
329+
except Exception as e:
330+
print(f'Error in {cfg}: {e}')
331+
323332
# Tensorboard (not working https://github.com/ultralytics/yolov5/issues/2898)
324333
# from torch.utils.tensorboard import SummaryWriter
325334
# tb_writer = SummaryWriter('.')

0 commit comments

Comments
 (0)