From d78a79bd258c08aeae78859b21fd3040dd0ad89a Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 16 Jul 2020 20:49:46 -0700 Subject: [PATCH 1/4] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 3bfb6f2..fc9201d 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -65,15 +65,15 @@ jobs: # define device di=cpu # inference devices # train - python train.py --weights weights/${{ matrix.yolo5-model }}.pt --cfg models/${{ matrix.yolo5-model }}.yaml --epochs 1 --img 320 --device $di --batch-size 2 + python train.py --weights weights/${{ matrix.yolo5-model }}.pt --cfg models/${{ matrix.yolo5-model }}.yaml --epochs 1 --img 320 --device $di --batch-size 8 # detect official python detect.py --weights weights/${{ matrix.yolo5-model }}.pt --device $di # detect custom python detect.py --weights runs/exp0/weights/last.pt --device $di # test official - python test.py --weights weights/${{ matrix.yolo5-model }}.pt --device $di --batch-size 1 + python test.py --weights weights/${{ matrix.yolo5-model }}.pt --device $di --batch 8 # test custom - python test.py --weights runs/exp0/weights/last.pt --device $di --batch-size 1 + python test.py --weights runs/exp0/weights/last.pt --device $di --batch 8 # inspect python models/yolo.py --cfg models/${{ matrix.yolo5-model }}.yaml # export From ddb0ec362d84be1485644037648f32bca2ac1191 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 16 Jul 2020 20:51:49 -0700 Subject: [PATCH 2/4] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index fc9201d..cb9640b 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -11,7 +11,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] #, macOS-10.15, windows-2019 - python-version: [3.7, 3.8] + python-version: [3.8] yolo5-model: ["yolov5s", "yolov5m", "yolov5l", "yolov5x"] # Timeout: https://stackoverflow.com/a/59076067/4521646 @@ -60,19 +60,15 @@ jobs: - name: Tests workflow run: | - # to run *.py. files in subdirectories - export PYTHONPATH="$PWD" - # define device - di=cpu # inference devices + export PYTHONPATH="$PWD" # to run *.py. files in subdirectories + di=cpu # inference devices # define device # train python train.py --weights weights/${{ matrix.yolo5-model }}.pt --cfg models/${{ matrix.yolo5-model }}.yaml --epochs 1 --img 320 --device $di --batch-size 8 - # detect official + # detect python detect.py --weights weights/${{ matrix.yolo5-model }}.pt --device $di - # detect custom python detect.py --weights runs/exp0/weights/last.pt --device $di - # test official + # test python test.py --weights weights/${{ matrix.yolo5-model }}.pt --device $di --batch 8 - # test custom python test.py --weights runs/exp0/weights/last.pt --device $di --batch 8 # inspect python models/yolo.py --cfg models/${{ matrix.yolo5-model }}.yaml From 34cbd7f1910c1bea1027f7b809ac20374e8a7c77 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 16 Jul 2020 20:53:41 -0700 Subject: [PATCH 3/4] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index cb9640b..0b7c46f 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -54,10 +54,6 @@ jobs: python -c "from utils.google_utils import * ; gdrive_download('1n_oKgR81BJtqk75b00eAjdv03qVCQn2f', 'coco128.zip')" mv ./coco128 ../ - - name: Download weights - run: | - bash weights/download_weights.sh - - name: Tests workflow run: | export PYTHONPATH="$PWD" # to run *.py. files in subdirectories From 02464bc0045a2e1aaf604ca5e7ae670e907346f4 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 16 Jul 2020 21:09:33 -0700 Subject: [PATCH 4/4] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 0b7c46f..0de328d 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -58,16 +58,16 @@ jobs: run: | export PYTHONPATH="$PWD" # to run *.py. files in subdirectories di=cpu # inference devices # define device + # train - python train.py --weights weights/${{ matrix.yolo5-model }}.pt --cfg models/${{ matrix.yolo5-model }}.yaml --epochs 1 --img 320 --device $di --batch-size 8 + python train.py --img 256 --batch 8 --weights weights/${{ matrix.yolo5-model }}.pt --cfg models/${{ matrix.yolo5-model }}.yaml --epochs 1 --device $di # detect python detect.py --weights weights/${{ matrix.yolo5-model }}.pt --device $di python detect.py --weights runs/exp0/weights/last.pt --device $di # test - python test.py --weights weights/${{ matrix.yolo5-model }}.pt --device $di --batch 8 - python test.py --weights runs/exp0/weights/last.pt --device $di --batch 8 - # inspect - python models/yolo.py --cfg models/${{ matrix.yolo5-model }}.yaml - # export - python models/export.py --weights weights/${{ matrix.yolo5-model }}.pt --img 640 --batch 1 + python test.py --img 256 --batch 8 --weights weights/${{ matrix.yolo5-model }}.pt --device $di + python test.py --img 256 --batch 8 --weights runs/exp0/weights/last.pt --device $di + + python models/yolo.py --cfg models/${{ matrix.yolo5-model }}.yaml # inspect + python models/export.py --img 256 --batch 1 --weights weights/${{ matrix.yolo5-model }}.pt # export shell: bash