From b7b604e6ae5fdcd26a4fc3acfeb9116d08e7c7a3 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 26 May 2022 17:55:00 +0200 Subject: [PATCH 1/8] Update and rename ci-testing.yml to ci.yml --- .github/workflows/ci-testing.yml | 93 ------------------------- .github/workflows/ci.yml | 115 +++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 93 deletions(-) delete mode 100644 .github/workflows/ci-testing.yml create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml deleted file mode 100644 index e5d5fc434f06..000000000000 --- a/.github/workflows/ci-testing.yml +++ /dev/null @@ -1,93 +0,0 @@ -# YOLOv5 🚀 by Ultralytics, GPL-3.0 license - -name: CI CPU testing - -on: # https://help.github.com/en/actions/reference/events-that-trigger-workflows - push: - branches: [ master ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ master ] - schedule: - - cron: '0 0 * * *' # Runs at 00:00 UTC every day - -jobs: - cpu-tests: - - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] - python-version: [ 3.9 ] - model: [ 'yolov5n' ] # models to test - - # Timeout: https://stackoverflow.com/a/59076067/4521646 - timeout-minutes: 60 - steps: - - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - - # Note: This uses an internal pip API and may not always work - # https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow - - name: Get pip cache - id: pip-cache - run: | - python -c "from pip._internal.locations import USER_CACHE_DIR; print('::set-output name=dir::' + USER_CACHE_DIR)" - - - name: Cache pip - uses: actions/cache@v3 - with: - path: ${{ steps.pip-cache.outputs.dir }} - key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('requirements.txt') }} - restore-keys: | - ${{ runner.os }}-${{ matrix.python-version }}-pip- - - # Known Keras 2.7.0 issue: https://github.com/ultralytics/yolov5/pull/5486 - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -qr requirements.txt -f https://download.pytorch.org/whl/cpu/torch_stable.html \ - onnx tensorflow-cpu # wandb - python --version - pip --version - pip list - shell: bash - - # - name: W&B login - # run: wandb login 345011b3fb26dc8337fd9b20e53857c1d403f2aa - - # - name: Download data - # run: | - # curl -L -o tmp.zip https://github.com/ultralytics/yolov5/releases/download/v1.0/coco128.zip - # unzip -q tmp.zip -d ../datasets - - - name: Tests workflow - run: | - # export PYTHONPATH="$PWD" # to run '$ python *.py' files in subdirectories - d=cpu # device - weights=runs/train/exp/weights/best.pt - - # Train - python train.py --img 64 --batch 32 --weights ${{ matrix.model }}.pt --cfg ${{ matrix.model }}.yaml --epochs 1 --device $d - # Val - python val.py --img 64 --batch 32 --weights ${{ matrix.model }}.pt --device $d - python val.py --img 64 --batch 32 --weights $weights --device $d - # Detect - python detect.py --weights ${{ matrix.model }}.pt --device $d - python detect.py --weights $weights --device $d - python hubconf.py # hub - # Export - python models/yolo.py --cfg ${{ matrix.model }}.yaml # build PyTorch model - python models/tf.py --weights ${{ matrix.model }}.pt # build TensorFlow model - python export.py --weights ${{ matrix.model }}.pt --img 64 --include torchscript onnx # export - # Python - python - < Date: Thu, 26 May 2022 18:02:45 +0200 Subject: [PATCH 2/8] Update ci.yml --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21f83d38b024..914c7c31f448 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,7 @@ on: - cron: '0 0 * * *' # runs at 00:00 UTC every day jobs: - benchmarks: - name: Benchmarks + Benchmarks: runs-on: ${{ matrix.os }} strategy: matrix: From ed0133e6f7c652e789911ae203b1411c64ee6464 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 26 May 2022 19:12:54 +0200 Subject: [PATCH 3/8] Update ci.yml --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 914c7c31f448..97b374e785ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip - pip install -r requirements.txt psutil IPython coremltools onnx onnxruntime openvino-dev tensorflow-cpu --extra-index-url https://download.pytorch.org/whl/cpu + pip install -r requirements.txt coremltools onnx onnxruntime openvino-dev tensorflow-cpu --extra-index-url https://download.pytorch.org/whl/cpu python --version pip --version pip list @@ -82,6 +82,9 @@ jobs: python --version pip --version pip list + - name: Check environment + run: | + python -c "import utils; utils.notebook_init()" echo "RUNNER_OS is $RUNNER_OS" echo "GITHUB_EVENT_NAME is $GITHUB_EVENT_NAME" echo "GITHUB_WORKFLOW is $GITHUB_WORKFLOW" From 781f3938edc2ddb89f38a8e10d2e1dcb151e34f7 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 26 May 2022 17:13:10 +0000 Subject: [PATCH 4/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97b374e785ee..55470a2b75d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -83,7 +83,7 @@ jobs: pip --version pip list - name: Check environment - run: | + run: | python -c "import utils; utils.notebook_init()" echo "RUNNER_OS is $RUNNER_OS" echo "GITHUB_EVENT_NAME is $GITHUB_EVENT_NAME" From 24dc6d59a642ee1d98c746a3b349df5e98e39ff1 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 26 May 2022 19:46:49 +0200 Subject: [PATCH 5/8] Update and rename ci.yml to ci-tests.yml --- .github/workflows/{ci.yml => ci-tests.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{ci.yml => ci-tests.yml} (97%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci-tests.yml similarity index 97% rename from .github/workflows/ci.yml rename to .github/workflows/ci-tests.yml index 55470a2b75d2..654cf2b54ac9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci-tests.yml @@ -78,7 +78,7 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip - pip install -r requirements.txt protobuf==3.20.1 --extra-index-url https://download.pytorch.org/whl/cpu + pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu python --version pip --version pip list From a4a006146c2e44ab669b7ad8b8a5ab1c02312e57 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 26 May 2022 20:02:17 +0200 Subject: [PATCH 6/8] Update ci-tests.yml --- .github/workflows/ci-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 654cf2b54ac9..4f0b3c1bfb89 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -24,12 +24,12 @@ jobs: - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - name: Cache pip - uses: actions/cache@v3 - with: - path: ~/.cache/pip - key: ${{ runner.os }}-Benchmarks-${{ hashFiles('requirements.txt') }} - restore-keys: ${{ runner.os }}-Benchmarks- + #- name: Cache pip + # uses: actions/cache@v3 + # with: + # path: ~/.cache/pip + # key: ${{ runner.os }}-Benchmarks-${{ hashFiles('requirements.txt') }} + # restore-keys: ${{ runner.os }}-Benchmarks- - name: Install requirements run: | python -m pip install --upgrade pip From f3174b076aed76702bd0372c6d39af81cd970ca2 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Thu, 26 May 2022 21:02:36 +0200 Subject: [PATCH 7/8] Update ci-tests.yml --- .github/workflows/ci-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 4f0b3c1bfb89..14f93455fa46 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -1,5 +1,5 @@ # YOLOv5 🚀 by Ultralytics, GPL-3.0 license -# YOLOv5 Continuous Integration (CI) tests run as GitHub Actions +# YOLOv5 Continuous Integration (CI) GitHub Actions tests name: YOLOv5 CI From 62c6778cfd213bad984162ab9a681c9dfe76f62b Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Fri, 27 May 2022 10:53:34 +0200 Subject: [PATCH 8/8] Rename ci-tests.yml to ci-testing.yml --- .github/workflows/{ci-tests.yml => ci-testing.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{ci-tests.yml => ci-testing.yml} (100%) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-testing.yml similarity index 100% rename from .github/workflows/ci-tests.yml rename to .github/workflows/ci-testing.yml