From 3c233bc0b7d3bb93289b7414a61457de92edb383 Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Tue, 2 Apr 2019 16:06:15 +0200
Subject: [PATCH] updates

---
 .gitignore    | 16 ++++++++++++----
 cfg/coco.data |  6 ------
 detect.py     |  2 +-
 test.py       |  2 +-
 train.py      |  6 +++---
 5 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100644 cfg/coco.data

diff --git a/.gitignore b/.gitignore
index a5574e82..ce7361ae 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,17 +8,25 @@
 *.PNG
 *.TIF
 *.HEIC
+*.mp4
+*.mov
+*.MOV
+*.avi
 *.data
-*.cfg
 *.json
-data/*
-pycocotools/*
-!cfg/coco.data
+
+*.cfg
 !cfg/yolov3*.cfg
+
+data/*
 !data/samples/zidane.jpg
 !data/coco.names
 !data/coco_paper.names
+!data/coco.data
+!data/coco_1cls.data
+!data/coco_1img.data
 
+pycocotools/*
 results*.txt
 
 # MATLAB GitIgnore -----------------------------------------------------------------------------------------------------
diff --git a/cfg/coco.data b/cfg/coco.data
deleted file mode 100644
index d248a4cd..00000000
--- a/cfg/coco.data
+++ /dev/null
@@ -1,6 +0,0 @@
-classes=80
-train=../coco/trainvalno5k.txt
-valid=../coco/5k.txt
-names=data/coco.names
-backup=backup/
-eval=coco
diff --git a/detect.py b/detect.py
index 4461af5b..f9b51a2f 100644
--- a/detect.py
+++ b/detect.py
@@ -106,7 +106,7 @@ def detect(
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument('--cfg', type=str, default='cfg/yolov3.cfg', help='cfg file path')
-    parser.add_argument('--data-cfg', type=str, default='cfg/coco.data', help='coco.data file path')
+    parser.add_argument('--data-cfg', type=str, default='data/coco.data', help='coco.data file path')
     parser.add_argument('--weights', type=str, default='weights/yolov3.weights', help='path to weights file')
     parser.add_argument('--images', type=str, default='data/samples', help='path to images')
     parser.add_argument('--img-size', type=int, default=32 * 13, help='size of each image dimension')
diff --git a/test.py b/test.py
index d0204fc4..4e6d45bb 100644
--- a/test.py
+++ b/test.py
@@ -165,7 +165,7 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(prog='test.py')
     parser.add_argument('--batch-size', type=int, default=32, help='size of each image batch')
     parser.add_argument('--cfg', type=str, default='cfg/yolov3.cfg', help='cfg file path')
-    parser.add_argument('--data-cfg', type=str, default='cfg/example_single_class.data', help='coco.data file path')
+    parser.add_argument('--data-cfg', type=str, default='data/coco.data', help='coco.data file path')
     parser.add_argument('--weights', type=str, default='weights/latesth.pt', help='path to weights file')
     parser.add_argument('--iou-thres', type=float, default=0.5, help='iou threshold required to qualify as detected')
     parser.add_argument('--conf-thres', type=float, default=0.001, help='object confidence threshold')
diff --git a/train.py b/train.py
index d8394311..1a6a98c5 100644
--- a/train.py
+++ b/train.py
@@ -62,8 +62,8 @@ def train(
             cutoff = load_darknet_weights(model, weights + 'yolov3-tiny.conv.15')
 
     # Transfer learning (train only YOLO layers)
-    # for i, (name, p) in enumerate(model.named_parameters()):
-    #     p.requires_grad = True if (p.shape[0] == 255) else False
+    # for (name, p) in model.named_parameters():
+    #     p.requires_grad = True if p.shape[0] == 255 else False
 
     # Set scheduler (reduce lr at epoch 250)
     scheduler = torch.optim.lr_scheduler.MultiStepLR(optimizer, milestones=[250], gamma=0.1, last_epoch=start_epoch - 1)
@@ -205,7 +205,7 @@ if __name__ == '__main__':
     parser.add_argument('--batch-size', type=int, default=16, help='size of each image batch')
     parser.add_argument('--accumulate', type=int, default=1, help='accumulate gradient x batches before optimizing')
     parser.add_argument('--cfg', type=str, default='cfg/yolov3.cfg', help='cfg file path')
-    parser.add_argument('--data-cfg', type=str, default='cfg/coco.data', help='coco.data file path')
+    parser.add_argument('--data-cfg', type=str, default='data/coco.data', help='coco.data file path')
     parser.add_argument('--multi-scale', action='store_true', help='random image sizes per batch 320 - 608')
     parser.add_argument('--img-size', type=int, default=32 * 13, help='pixels')
     parser.add_argument('--resume', action='store_true', help='resume training flag')