From 4114d5e9c9c1540dd0d466f0af3797bfec73c68f Mon Sep 17 00:00:00 2001
From: Glenn Jocher <glenn.jocher@ultralytics.com>
Date: Fri, 22 Mar 2019 17:53:06 +0200
Subject: [PATCH] updates

---
 test.py      |  2 +-
 utils/gcp.sh | 27 +++++++++------------------
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/test.py b/test.py
index a4bba9a3..5d0ca98a 100644
--- a/test.py
+++ b/test.py
@@ -43,7 +43,7 @@ def test(
 
     # Dataloader
     dataset = LoadImagesAndLabels(test_path, img_size=img_size)
-    dataloader = DataLoader(dataset, batch_size=batch_size, num_workers=0)
+    dataloader = DataLoader(dataset, batch_size=batch_size, num_workers=4)
 
     mean_mAP, mean_R, mean_P, seen = 0.0, 0.0, 0.0, 0
     print('%11s' * 5 % ('Image', 'Total', 'P', 'R', 'mAP'))
diff --git a/utils/gcp.sh b/utils/gcp.sh
index 1b58f373..50274913 100755
--- a/utils/gcp.sh
+++ b/utils/gcp.sh
@@ -6,7 +6,7 @@ bash yolov3/data/get_coco_dataset.sh
 sudo rm -rf cocoapi && git clone https://github.com/cocodataset/cocoapi && cd cocoapi/PythonAPI && make && cd ../.. && cp -r cocoapi/PythonAPI/pycocotools yolov3
 sudo shutdown
 
-# Start
+# Train
 sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3
 cp -r weights yolov3
 cd yolov3 && python3 train.py --batch-size 16 --epochs 1
@@ -16,30 +16,21 @@ sudo shutdown
 python3 train.py --resume
 
 # Detect
-sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3
-cd yolov3 && python3 detect.py
+python3 detect.py
 
-# Clone branch
+# Clone a branch
 sudo rm -rf yolov3 && git clone -b multi_gpu --depth 1 https://github.com/ultralytics/yolov3
-cd yolov3 && python3 train.py --batch-size 26
-
-sudo rm -rf yolov3 && git clone -b multigpu --depth 1 https://github.com/alexpolichroniadis/yolov3
-cp coco.data yolov3/cfg
-cd yolov3 && python3 train.py --batch-size 26
 
 # Test
 sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3
 sudo rm -rf cocoapi && git clone https://github.com/cocodataset/cocoapi && cd cocoapi/PythonAPI && make && cd ../.. && cp -r cocoapi/PythonAPI/pycocotools yolov3
 cd yolov3 && python3 test.py --save-json --conf-thres 0.005
 
-# Test Darknet
+# Test Darknet training
 python3 test.py --img_size 416 --weights ../darknet/backup/yolov3.backup
 
-# Download and Resume
-sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3 && cd yolov3
+# Download with wget
 wget https://storage.googleapis.com/ultralytics/yolov3.pt -O weights/latest.pt
-python3 train.py --img_size 416 --batch_size 16 --epochs 1 --resume
-python3 test.py --img_size 416 --weights weights/latest.pt --conf_thres 0.5
 
 # Copy latest.pt to bucket
 gsutil cp yolov3/weights/latest.pt gs://ultralytics
@@ -48,8 +39,8 @@ gsutil cp yolov3/weights/latest.pt gs://ultralytics
 gsutil cp gs://ultralytics/latest.pt yolov3/weights/latest.pt
 wget https://storage.googleapis.com/ultralytics/latest.pt
 
-# Testing
-sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3 && cd yolov3
-python3 train.py --epochs 3 --var 64
+# Trade Studies
+sudo rm -rf yolov3 && git clone https://github.com/ultralytics/yolov3
+cp -r weights yolov3
+cd yolov3 && python3 train.py --batch-size 16 --epochs 1
 sudo shutdown
-