From f0d1e099e247f6c06b02d4f7b4bd776c3af0a5f1 Mon Sep 17 00:00:00 2001
From: Jirka <jirka.borovec@seznam.cz>
Date: Thu, 16 Jul 2020 11:45:17 +0200
Subject: [PATCH] weights

---
 .github/workflows/ci-testing.yml | 19 ++++++++++---------
 data/coco128.yaml                |  4 ++--
 weights/download_weights.sh      |  6 ++++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml
index 659cb49..2100c1d 100644
--- a/.github/workflows/ci-testing.yml
+++ b/.github/workflows/ci-testing.yml
@@ -47,28 +47,29 @@ jobs:
         pip list
       shell: bash
 
-    #- name: Download data
-    #  run: |
-    #    python3 -c "from utils.google_utils import *; gdrive_download('1n_oKgR81BJtqk75b00eAjdv03qVCQn2f', 'coco128.zip')" && mv ./coco128 ../
+    - name: Download data
+      run: |
+        python -c "from utils.google_utils import * ; gdrive_download('1n_oKgR81BJtqk75b00eAjdv03qVCQn2f', 'coco128.zip')"
+        bash weights/download_weights.sh
 
     - name: Tests
       run: |
-        for x in yolov5s yolov5m yolov5l yolov5x # models
+        for name in yolov5s yolov5m yolov5l yolov5x # models
         do
           di=cpu # inference devices
           # train
-          python train.py --weights $x.pt --cfg $x.yaml --epochs 3 --img 320 --device $di --batch-size 2
+          python train.py --weights weights/$name.pt --cfg models/$name.yaml --epochs 1 --img 320 --device $di --batch-size 2
           # detect official
-          python detect.py --weights $x.pt --device $di --batch-size 2
+          python detect.py --weights weights/$name.pt --device $di --batch-size 2
           # detect custom
           python detect.py --weights runs/exp0/weights/last.pt --device $di --batch-size 2
           # test official
-          python test.py --weights $x.pt --device $di --batch-size 2
+          python test.py --weights weights/$name.pt --device $di --batch-size 2
           # test custom
           python test.py --weights runs/exp0/weights/last.pt --device $di  --batch-size 2
           # inspect
-          python models/yolo.py --cfg $x.yaml
+          python models/yolo.py --cfg models/$name.yaml
           # export
-          python models/export.py --weights $x.pt --img 640 --batch 1
+          python models/export.py --weights weights/$name.pt --img 640 --batch 1
         done
       shell: bash
diff --git a/data/coco128.yaml b/data/coco128.yaml
index 9f47382..d5835c6 100644
--- a/data/coco128.yaml
+++ b/data/coco128.yaml
@@ -8,8 +8,8 @@
 
 
 # train and val data as 1) directory: path/images/, 2) file: path/images.txt, or 3) list: [path1/images/, path2/images/]
-train: ../coco128/images/train2017/  # 128 images
-val: ../coco128/images/train2017/  # 128 images
+train: coco128/images/train2017/  # 128 images
+val: coco128/images/train2017/  # 128 images
 
 # number of classes
 nc: 80
diff --git a/weights/download_weights.sh b/weights/download_weights.sh
index 6834ddb..206b700 100755
--- a/weights/download_weights.sh
+++ b/weights/download_weights.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 # Download common models
 
-python3 -c "from utils.google_utils import *;
+python -c "
+from utils.google_utils import *;
 attempt_download('weights/yolov5s.pt');
 attempt_download('weights/yolov5m.pt');
 attempt_download('weights/yolov5l.pt');
-attempt_download('weights/yolov5x.pt')"
+attempt_download('weights/yolov5x.pt')
+"