Update models/hub *.yaml files for v2.0 (#546)
Browse files* fix #543 issue
* Update yolov3-spp.yaml
* Update yolov5-fpn.yaml
* Update yolov5-panet.yaml
Co-authored-by: Glenn Jocher <[email protected]>
- models/hub/yolov3-spp.yaml +7 -10
- models/hub/yolov5-fpn.yaml +6 -9
- models/hub/yolov5-panet.yaml +10 -14
models/hub/yolov3-spp.yaml
CHANGED
@@ -27,28 +27,25 @@ backbone:
|
|
27 |
|
28 |
# YOLOv3-SPP head
|
29 |
head:
|
30 |
-
[[-1, 1, Bottleneck, [1024, False]],
|
31 |
[-1, 1, SPP, [512, [5, 9, 13]]],
|
32 |
[-1, 1, Conv, [1024, 3, 1]],
|
33 |
[-1, 1, Conv, [512, 1, 1]],
|
34 |
-
[-1, 1, Conv, [1024, 3, 1]],
|
35 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 16 (P5/32-large)
|
36 |
|
37 |
-
[-
|
38 |
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
39 |
[[-1, 8], 1, Concat, [1]], # cat backbone P4
|
40 |
[-1, 1, Bottleneck, [512, False]],
|
41 |
[-1, 1, Bottleneck, [512, False]],
|
42 |
[-1, 1, Conv, [256, 1, 1]],
|
43 |
-
[-1, 1, Conv, [512, 3, 1]],
|
44 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 24 (P4/16-medium)
|
45 |
|
46 |
-
[-
|
47 |
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
48 |
[[-1, 6], 1, Concat, [1]], # cat backbone P3
|
49 |
[-1, 1, Bottleneck, [256, False]],
|
50 |
-
[-1, 2, Bottleneck, [256, False]],
|
51 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 30 (P3/8-small)
|
52 |
|
53 |
-
[[], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5)
|
54 |
]
|
|
|
27 |
|
28 |
# YOLOv3-SPP head
|
29 |
head:
|
30 |
+
[[-1, 1, Bottleneck, [1024, False]],
|
31 |
[-1, 1, SPP, [512, [5, 9, 13]]],
|
32 |
[-1, 1, Conv, [1024, 3, 1]],
|
33 |
[-1, 1, Conv, [512, 1, 1]],
|
34 |
+
[-1, 1, Conv, [1024, 3, 1]], # 15 (P5/32-large)
|
|
|
35 |
|
36 |
+
[-2, 1, Conv, [256, 1, 1]],
|
37 |
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
38 |
[[-1, 8], 1, Concat, [1]], # cat backbone P4
|
39 |
[-1, 1, Bottleneck, [512, False]],
|
40 |
[-1, 1, Bottleneck, [512, False]],
|
41 |
[-1, 1, Conv, [256, 1, 1]],
|
42 |
+
[-1, 1, Conv, [512, 3, 1]], # 22 (P4/16-medium)
|
|
|
43 |
|
44 |
+
[-2, 1, Conv, [128, 1, 1]],
|
45 |
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
46 |
[[-1, 6], 1, Concat, [1]], # cat backbone P3
|
47 |
[-1, 1, Bottleneck, [256, False]],
|
48 |
+
[-1, 2, Bottleneck, [256, False]], # 27 (P3/8-small)
|
|
|
49 |
|
50 |
+
[[27, 22, 15], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5)
|
51 |
]
|
models/hub/yolov5-fpn.yaml
CHANGED
@@ -26,20 +26,17 @@ backbone:
|
|
26 |
|
27 |
# YOLOv5 FPN head
|
28 |
head:
|
29 |
-
[[-1, 3, BottleneckCSP, [1024, False]],
|
30 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 11 (P5/32-large)
|
31 |
|
32 |
-
[-
|
33 |
[[-1, 6], 1, Concat, [1]], # cat backbone P4
|
34 |
[-1, 1, Conv, [512, 1, 1]],
|
35 |
-
[-1, 3, BottleneckCSP, [512, False]],
|
36 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 16 (P4/16-medium)
|
37 |
|
38 |
-
[-
|
39 |
[[-1, 4], 1, Concat, [1]], # cat backbone P3
|
40 |
[-1, 1, Conv, [256, 1, 1]],
|
41 |
-
[-1, 3, BottleneckCSP, [256, False]],
|
42 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 21 (P3/8-small)
|
43 |
|
44 |
-
[[], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5)
|
45 |
]
|
|
|
26 |
|
27 |
# YOLOv5 FPN head
|
28 |
head:
|
29 |
+
[[-1, 3, BottleneckCSP, [1024, False]], # 10 (P5/32-large)
|
|
|
30 |
|
31 |
+
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
32 |
[[-1, 6], 1, Concat, [1]], # cat backbone P4
|
33 |
[-1, 1, Conv, [512, 1, 1]],
|
34 |
+
[-1, 3, BottleneckCSP, [512, False]], # 14 (P4/16-medium)
|
|
|
35 |
|
36 |
+
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
37 |
[[-1, 4], 1, Concat, [1]], # cat backbone P3
|
38 |
[-1, 1, Conv, [256, 1, 1]],
|
39 |
+
[-1, 3, BottleneckCSP, [256, False]], # 18 (P3/8-small)
|
|
|
40 |
|
41 |
+
[[18, 14, 10], 1, Detect, [nc, anchors]], # Detect(P3, P4, P5)
|
42 |
]
|
models/hub/yolov5-panet.yaml
CHANGED
@@ -21,32 +21,28 @@ backbone:
|
|
21 |
[-1, 9, BottleneckCSP, [512]],
|
22 |
[-1, 1, Conv, [1024, 3, 2]], # 7-P5/32
|
23 |
[-1, 1, SPP, [1024, [5, 9, 13]]],
|
|
|
24 |
]
|
25 |
|
26 |
# YOLOv5 PANet head
|
27 |
head:
|
28 |
-
[[-1,
|
29 |
-
[-1, 1, Conv, [512, 1, 1]], # 10
|
30 |
-
|
31 |
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
32 |
[[-1, 6], 1, Concat, [1]], # cat backbone P4
|
33 |
-
[-1, 3, BottleneckCSP, [512, False]],
|
34 |
-
[-1, 1, Conv, [256, 1, 1]], # 14
|
35 |
|
|
|
36 |
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
37 |
[[-1, 4], 1, Concat, [1]], # cat backbone P3
|
38 |
-
[-1, 3, BottleneckCSP, [256, False]],
|
39 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 18 (P3/8-small)
|
40 |
|
41 |
-
[-
|
42 |
[[-1, 14], 1, Concat, [1]], # cat head P4
|
43 |
-
[-1, 3, BottleneckCSP, [512, False]],
|
44 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 22 (P4/16-medium)
|
45 |
|
46 |
-
[-
|
47 |
[[-1, 10], 1, Concat, [1]], # cat head P5
|
48 |
-
[-1, 3, BottleneckCSP, [1024, False]],
|
49 |
-
[-1, 1, nn.Conv2d, [na * (nc + 5), 1, 1]], # 26 (P5/32-large)
|
50 |
|
51 |
-
[[], 1, Detect, [nc, anchors]], # Detect(P5, P4, P3)
|
52 |
]
|
|
|
21 |
[-1, 9, BottleneckCSP, [512]],
|
22 |
[-1, 1, Conv, [1024, 3, 2]], # 7-P5/32
|
23 |
[-1, 1, SPP, [1024, [5, 9, 13]]],
|
24 |
+
[-1, 3, BottleneckCSP, [1024, False]], # 9
|
25 |
]
|
26 |
|
27 |
# YOLOv5 PANet head
|
28 |
head:
|
29 |
+
[[-1, 1, Conv, [512, 1, 1]],
|
|
|
|
|
30 |
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
31 |
[[-1, 6], 1, Concat, [1]], # cat backbone P4
|
32 |
+
[-1, 3, BottleneckCSP, [512, False]], # 13
|
|
|
33 |
|
34 |
+
[-1, 1, Conv, [256, 1, 1]],
|
35 |
[-1, 1, nn.Upsample, [None, 2, 'nearest']],
|
36 |
[[-1, 4], 1, Concat, [1]], # cat backbone P3
|
37 |
+
[-1, 3, BottleneckCSP, [256, False]], # 17 (P3/8-small)
|
|
|
38 |
|
39 |
+
[-1, 1, Conv, [256, 3, 2]],
|
40 |
[[-1, 14], 1, Concat, [1]], # cat head P4
|
41 |
+
[-1, 3, BottleneckCSP, [512, False]], # 20 (P4/16-medium)
|
|
|
42 |
|
43 |
+
[-1, 1, Conv, [512, 3, 2]],
|
44 |
[[-1, 10], 1, Concat, [1]], # cat head P5
|
45 |
+
[-1, 3, BottleneckCSP, [1024, False]], # 23 (P5/32-large)
|
|
|
46 |
|
47 |
+
[[17, 20, 23], 1, Detect, [nc, anchors]], # Detect(P5, P4, P3)
|
48 |
]
|