diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 76e8470..0ee330a 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -10,9 +10,9 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest] # [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] python-version: [3.8] - model: ['yolov5s', 'yolov5m', 'yolov5l', 'yolov5x'] # models to test + model: ['yolov5s'] # models to test # Timeout: https://stackoverflow.com/a/59076067/4521646 timeout-minutes: 50 @@ -41,7 +41,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -q numpy # for cocoapi proper install pip install -qr requirements.txt -f https://download.pytorch.org/whl/cpu/torch_stable.html pip install -q onnx python --version diff --git a/requirements.txt b/requirements.txt index 0522838..c392661 100755 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ PyYAML>=5.3 torchvision>=0.6 scipy tqdm -pycocotools>=2.0 +# pycocotools>=2.0 # Nvidia Apex (optional) for mixed precision training -------------------------- # git clone https://github.com/NVIDIA/apex && cd apex && pip install -v --no-cache-dir --global-option="--cpp_ext" --global-option="--cuda_ext" . --user && cd .. && rm -rf apex diff --git a/test.py b/test.py index cb43008..b1e6a23 100644 --- a/test.py +++ b/test.py @@ -220,8 +220,8 @@ def test(data, cocoEval.accumulate() cocoEval.summarize() map, map50 = cocoEval.stats[:2] # update results (mAP@0.5:0.95, mAP@0.5) - except: - print('pycocotools not evaluated') + except Exception as e: + print('ERROR: pycocotools unable to run: %s' % e) # Return results model.float() # for training diff --git a/utils/google_utils.py b/utils/google_utils.py index 0a3dec1..ca9600b 100644 --- a/utils/google_utils.py +++ b/utils/google_utils.py @@ -51,7 +51,7 @@ def gdrive_download(id='1n_oKgR81BJtqk75b00eAjdv03qVCQn2f', name='coco128.zip'): s = "curl -Lb ./cookie \"drive.google.com/uc?export=download&confirm=`awk '/download/ {print $NF}' ./cookie`&id=%s\" -o %s" % ( id, name) else: # small file - s = "curl -s -L -o %s 'drive.google.com/uc?export=download&id=%s'" % (name, id) + s = 'curl -s -L -o %s "drive.google.com/uc?export=download&id=%s"' % (name, id) r = os.system(s) # execute, capture return values os.remove('cookie') if os.path.exists('cookie') else None