修复训练过程中的验证

3a3529f2 · Egrt · 9e2bf52f · 9e2bf52f · 9e2bf52f · 3a3529f2
展开全部隐藏空白更改
内联并排

Showing with 5 addition and 1049 deletion

2007_train.txt 2007_train.txt +0 -939

2007_val.txt 2007_val.txt +0 -105

utils/callbacks.py utils/callbacks.py +5 -5

未找到文件。
--- a/2007_train.txt
+++ b/2007_train.txt
--- a/2007_val.txt
+++ b/2007_val.txt
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000003.jpg 83,177,107,172,124,258,99,263,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000017.jpg 79,228,134,222,135,236,81,242,0 359,114,415,111,416,123,360,125,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000047.jpg 129,136,146,129,172,188,155,196,0 296,234,305,217,313,221,304,238,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000050.jpg 48,141,58,137,70,164,60,168,0 258,72,269,71,272,101,261,103,0 158,262,168,259,178,284,168,287,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000052.jpg 145,98,167,91,194,175,172,182,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000055.jpg 143,156,146,125,270,137,267,168,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000060.jpg 150,51,166,51,166,100,150,100,0 200,224,221,222,225,270,204,272,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000061.jpg 81,113,93,75,106,80,94,118,0 358,143,358,93,374,93,374,143,0 28,187,40,184,47,214,35,216,0 408,267,432,265,435,315,410,316,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000065.jpg 196,92,214,19,239,25,221,98,0 91,236,121,236,121,309,91,309,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000075.jpg 169,109,190,105,207,189,186,194,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000079.jpg 141,48,155,42,172,83,158,89,0 315,255,330,249,346,291,332,297,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000102.jpg 145,169,243,135,251,159,154,193,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000104.jpg 177,237,271,199,278,216,184,254,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000111.jpg 47,121,57,118,64,144,54,147,0 223,57,234,55,238,87,227,89,0 141,225,154,223,158,247,145,249,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000120.jpg 150,116,163,113,173,160,160,163,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000122.jpg 99,113,117,111,122,180,105,181,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000130.jpg 252,209,255,117,286,118,283,210,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000148.jpg 230,245,230,213,239,213,239,245,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000171.jpg 35,43,45,41,49,62,39,64,0 178,196,187,195,190,217,181,218,0 339,125,347,124,353,155,346,156,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000177.jpg 53,29,61,28,64,66,56,67,0 252,17,261,16,263,41,254,42,0 393,167,403,165,407,195,397,196,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000180.jpg 39,151,51,148,64,196,52,200,0 152,43,161,42,163,73,154,74,0 267,201,277,197,294,239,284,243,0 393,72,402,70,408,94,398,97,0 118,172,126,171,136,220,128,221,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000202.jpg 194,128,195,118,228,121,227,131,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000228.jpg 126,284,129,265,213,277,210,296,0 404,311,406,295,437,300,434,316,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000239.jpg 212,155,273,29,303,43,242,169,0 107,340,196,187,223,203,134,356,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000248.jpg 69,144,82,143,84,170,71,171,0 43,207,49,206,51,220,45,221,0 206,158,215,157,217,182,208,183,0 232,244,243,243,246,271,235,272,0 349,79,372,54,383,63,359,89,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000251.jpg 148,101,198,90,201,105,151,116,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000264.jpg 283,71,283,42,295,42,295,71,0 257,119,257,105,263,105,263,119,0 242,217,242,198,250,198,250,217,0 418,56,429,55,430,80,420,81,0 443,142,456,140,460,167,447,169,0 11,18,33,8,37,16,14,26,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000276.jpg 29,43,60,37,88,193,57,198,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000277.jpg 154,28,169,25,176,68,162,70,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000279.jpg 186,196,201,193,211,238,197,241,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000280.jpg 119,239,134,238,139,292,123,293,0 427,90,442,87,452,132,437,135,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000297.jpg 32,22,45,19,50,46,38,49,0 65,118,79,117,82,150,67,151,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000300.jpg 120,67,156,42,165,56,130,80,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000310.jpg 439,203,459,198,486,299,465,305,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000315.jpg 108,16,125,13,134,62,117,65,0 437,368,453,366,462,418,445,420,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000323.jpg 125,127,142,123,152,171,136,175,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000326.jpg 74,212,92,210,101,279,83,281,0 432,36,451,33,460,90,441,93,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000335.jpg 223,16,226,1,273,8,270,24,0 414,76,415,67,434,69,433,79,0 378,159,428,140,433,153,383,172,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000360.jpg 263,61,273,59,281,90,270,92,0 229,279,243,276,251,318,237,321,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000372.jpg 34,18,46,15,60,67,48,70,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000390.jpg 94,106,94,37,114,37,114,106,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000394.jpg 59,184,104,164,110,177,65,197,0 98,103,98,93,112,93,112,103,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000395.jpg 268,100,269,87,317,90,316,103,0 423,243,467,222,473,235,429,255,0 461,152,474,150,475,159,462,161,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000411.jpg 80,52,130,50,136,184,87,187,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000433.jpg 67,67,99,61,119,161,87,168,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000434.jpg 209,91,240,83,290,274,259,282,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000440.jpg 19,94,55,81,103,225,67,237,0 362,121,393,115,436,327,406,333,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000452.jpg 59,106,89,99,108,186,78,193,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000457.jpg 127,296,170,252,188,269,145,314,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000482.jpg 82,76,115,73,125,179,91,182,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000513.jpg 411,146,423,142,452,234,440,238,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000515.jpg 50,188,64,184,93,271,79,275,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000532.jpg 50,109,52,40,78,41,76,110,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000540.jpg 307,271,311,133,362,135,358,272,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000553.jpg 414,249,425,192,444,196,433,253,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000561.jpg 263,253,280,143,316,148,299,259,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000571.jpg 235,125,285,124,286,263,237,264,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000572.jpg 82,225,86,84,136,86,132,226,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000594.jpg 221,148,224,123,345,137,342,163,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000609.jpg 151,174,251,163,254,189,154,200,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000613.jpg 289,125,386,115,389,140,292,150,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000618.jpg 176,158,279,145,282,172,180,184,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000649.jpg 142,308,158,294,164,301,147,315,0 144,36,150,34,161,61,155,63,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000656.jpg 88,124,96,122,103,154,95,156,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000662.jpg 27,55,34,52,54,108,46,111,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000671.jpg 424,227,456,201,466,213,434,239,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000672.jpg 199,268,210,263,227,308,215,312,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000675.jpg 398,253,409,249,424,286,413,290,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000700.jpg 274,168,278,111,301,113,296,170,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000719.jpg 444,272,455,217,474,221,464,275,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000745.jpg 106,163,112,135,264,169,257,197,0 9,139,15,121,81,141,76,159,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000749.jpg 72,152,76,133,178,154,174,173,0 65,163,71,144,173,176,167,195,0 60,180,67,160,167,195,160,215,0 204,191,210,163,435,209,429,237,0 275,225,279,205,430,235,426,255,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000752.jpg 88,40,122,17,200,134,166,157,0 175,169,228,144,315,336,261,360,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000753.jpg 125,143,237,126,241,154,129,171,0 355,288,395,280,398,293,357,301,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000770.jpg 306,170,318,162,335,188,323,195,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000795.jpg 196,80,196,51,208,51,208,80,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000838.jpg 331,101,362,94,374,148,343,155,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000855.jpg 239,139,252,138,260,215,248,216,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000917.jpg 341,149,346,83,360,84,355,150,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000918.jpg 315,152,330,132,385,172,370,192,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000922.jpg 378,125,393,115,417,148,403,158,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000927.jpg 231,146,272,115,287,135,246,166,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000932.jpg 185,106,207,85,265,148,243,168,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000941.jpg 325,160,325,104,347,104,347,160,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000946.jpg 213,152,225,132,278,166,265,186,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000951.jpg 416,138,447,136,448,146,417,148,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000954.jpg 156,260,206,243,212,261,162,278,0 210,77,230,70,241,99,222,107,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000966.jpg 117,135,123,101,132,102,126,136,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000967.jpg 385,182,389,147,398,148,393,183,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000971.jpg 187,70,207,54,215,64,194,80,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000993.jpg 69,161,96,133,155,192,128,220,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/000996.jpg 122,170,139,154,172,189,155,205,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001019.jpg 179,129,208,101,216,111,188,138,0 124,224,124,211,162,211,162,224,0 33,143,37,131,66,140,62,152,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001022.jpg 241,222,250,212,269,231,259,240,0 422,133,468,123,473,144,427,155,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001044.jpg 294,109,326,107,327,124,295,125,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001054.jpg 295,112,316,112,316,119,295,119,0 409,231,430,229,431,235,410,236,0 319,267,338,264,339,270,320,274,0 209,208,223,206,224,212,210,214,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001058.jpg 184,66,184,59,208,59,208,66,0 301,178,322,178,322,183,301,183,0 211,214,231,214,231,220,211,220,0 101,155,116,155,116,160,101,160,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001074.jpg 146,129,162,126,164,136,147,138,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001078.jpg 153,77,171,68,190,106,172,115,0 147,172,147,150,159,150,159,172,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001099.jpg 58,177,58,149,70,149,70,177,0 159,65,159,45,168,45,168,65,0 136,214,136,186,148,186,148,214,0 188,152,188,132,198,132,198,152,0 236,120,245,118,248,135,239,137,0 298,144,298,127,308,127,308,144,0 335,68,346,64,353,84,342,88,0 251,236,280,219,288,232,259,250,0 259,265,275,243,286,251,271,273,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001102.jpg 52,33,54,14,62,15,60,34,0 28,158,41,158,41,184,28,184,0 82,124,82,104,92,104,92,124,0 129,89,141,89,141,107,129,107,0 143,209,170,188,181,202,153,223,0 150,231,172,213,183,226,161,244,0 192,116,192,99,201,99,201,116,0 228,41,238,36,247,54,237,58,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001128.jpg 54,78,57,68,84,75,81,86,0 69,164,72,154,103,163,100,173,0 193,80,197,69,236,85,231,96,0 186,221,189,211,217,221,214,230,0 310,159,313,149,342,158,339,168,0 377,82,381,71,407,82,403,92,0 412,158,415,147,440,155,437,165,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001133.jpg 240,81,241,68,282,70,281,84,0 144,173,146,164,168,167,166,177,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001145.jpg 51,80,51,72,74,72,74,80,0 387,122,388,115,407,119,405,126,0
-D:\Notebook\yolov7-pytorch\VOCdevkit/VOC2007/JPEGImages/001158.jpg 91,29,95,22,117,34,113,41,0 26,74,27,66,46,71,45,78,0 25,129,26,122,42,124,41,132,0 79,159,80,153,96,155,95,161,0 215,140,234,134,236,143,218,148,0
--- a/utils/callbacks.py
+++ b/utils/callbacks.py
@@ -79,7 +79,7 @@ class LossHistory():

 class EvalCallback():
    def __init__(self, net, input_shape, anchors, anchors_mask, class_names, num_classes, val_lines, log_dir, cuda, \
-            map_out_path=".temp_map_out", max_boxes=100, confidence=0.05, nms_iou=0.5, letterbox_image=True, MINOVERLAP=0.5, eval_flag=True, period=1):
+            map_out_path=".temp_map_out", max_boxes=100, confidence=0.05, nms_iou=0.5, letterbox_image=False, MINOVERLAP=0.5, eval_flag=True, period=1):
        super(EvalCallback, self).__init__()
        
        self.net                = net
@@ -202,9 +202,9 @@ class EvalCallback():
                #------------------------------#
                #   将polygon转换为hbb
                #------------------------------#
-                hbbs        = np.zeros((gt_boxes.shape[0], 6))
-                hbbs[:, :5] = poly2hbb(gt_boxes[:, :8])
-                hbbs[:, 5]  = gt_boxes[:, 8]
+                hbbs        = np.zeros((gt_boxes.shape[0], 5))
+                hbbs[..., :4] = poly2hbb(gt_boxes[..., :8])
+                hbbs[..., 4]  = gt_boxes[..., 8]
                #------------------------------#
                #   获得预测txt
                #------------------------------#
@@ -220,7 +220,7 @@ class EvalCallback():
                        top    = yc - h/2
                        right  = xc + w/2
                        bottom = yc + h/2
-                        obj_name = self.class_names[obj]
+                        obj_name = self.class_names[int(obj)]
                        new_f.write("%s %s %s %s %s\n" % (obj_name, left, top, right, bottom))
                        
            print("Calculate Map.")