From a5bc53bd4c1c30aaef6c39bd7baf85f7cf1ef441 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 20:40:40 +0200 Subject: [PATCH 01/23] Add torch==1.7.0 to CI tests --- .github/workflows/ci-testing.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 0b7fd824d7ea..6df7e7808350 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -50,16 +50,24 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] python-version: ['3.10'] model: [yolov5n] + torch: [latest] include: - os: ubuntu-latest python-version: '3.7' # '3.6.8' min model: yolov5n + torch: latest - os: ubuntu-latest python-version: '3.8' model: yolov5n + torch: latest - os: ubuntu-latest python-version: '3.9' model: yolov5n + torch: latest + - os: ubuntu-latest + python-version: '3.10' + model: yolov5n + torch: 1.7.0 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -78,7 +86,12 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip wheel - pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu + if [ ${{ matrix.torch }} == "latest" ] + then + pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu + else + pip install -r requirements.txt torch==1.7.0 torchvision=0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu + fi python --version pip --version pip list From b5de8ab7ec8c4f961fb4898dfe9a9ba53da48973 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 20:42:59 +0200 Subject: [PATCH 02/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 6df7e7808350..1e7add60cabf 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -90,7 +90,7 @@ jobs: then pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu else - pip install -r requirements.txt torch==1.7.0 torchvision=0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu + pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu fi python --version pip --version From 75c046db7a5a77557184269697a6b0b7ba4ebae2 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 20:44:32 +0200 Subject: [PATCH 03/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 1e7add60cabf..0a109952e85a 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -86,8 +86,7 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip wheel - if [ ${{ matrix.torch }} == "latest" ] - then + if [ ${{ matrix.model }} == "latest" ]; then pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu else pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu From ad61edbeb80c7643d83175a887d6e6cebc1e5a16 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 20:48:24 +0200 Subject: [PATCH 04/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 0a109952e85a..d79446a57993 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -86,7 +86,7 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip wheel - if [ ${{ matrix.model }} == "latest" ]; then + if [ "${{ matrix.model }}" == "latest" ]; then pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu else pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu From 35ae318a0acf44bd5459f67401d88338ae28b308 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 20:50:52 +0200 Subject: [PATCH 05/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index d79446a57993..9f83899d9c3c 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -86,7 +86,7 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip wheel - if [ "${{ matrix.model }}" == "latest" ]; then + if [ "${{ matrix.torch }}" == "latest" ]; then pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu else pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu From 4c37b11a524c65fe220e1414d066cea1beeca6d3 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 20:53:22 +0200 Subject: [PATCH 06/23] 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 9f83899d9c3c..7d885998a413 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -64,10 +64,10 @@ jobs: python-version: '3.9' model: yolov5n torch: latest - - os: ubuntu-latest - python-version: '3.10' + - os: ubuntu-latest # min torch version CI https://pypi.org/project/torchvision/ + python-version: '3.8' model: yolov5n - torch: 1.7.0 + torch: '1.7.0' steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 From 8e3b37d1169334e154b64aec4ce4ec4f3c7af83c Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 21:09:05 +0200 Subject: [PATCH 07/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 7d885998a413..f11677192597 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -64,10 +64,10 @@ jobs: python-version: '3.9' model: yolov5n torch: latest - - os: ubuntu-latest # min torch version CI https://pypi.org/project/torchvision/ - python-version: '3.8' + - os: ubuntu-latest + python-version: '3.10' model: yolov5n - torch: '1.7.0' + torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -83,17 +83,16 @@ jobs: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('requirements.txt') }} restore-keys: ${{ runner.os }}-${{ matrix.python-version }}-pip- + - name: Install torch==1.7.0 requirements + if: matrix.torch == '1.7.0' + run: | + python -m pip install --upgrade pip wheel + pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu - name: Install requirements + if: matrix.torch == 'latest' run: | python -m pip install --upgrade pip wheel - if [ "${{ matrix.torch }}" == "latest" ]; then - pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu - else - pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu - fi - python --version - pip --version - pip list + pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu - name: Check environment run: | python -c "import utils; utils.notebook_init()" @@ -103,6 +102,9 @@ jobs: echo "GITHUB_ACTOR is ${{ github.actor }}" echo "GITHUB_REPOSITORY is ${{ github.repository }}" echo "GITHUB_REPOSITORY_OWNER is ${{ github.repository_owner }}" + python --version + pip --version + pip list - name: Run tests shell: bash run: | From 8e598b8273e6dccc516f3644f9427b88a0cc0e85 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 22:22:59 +0200 Subject: [PATCH 08/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index f11677192597..5b31a1b44ae1 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -65,7 +65,7 @@ jobs: model: yolov5n torch: latest - os: ubuntu-latest - python-version: '3.10' + python-version: '3.9' model: yolov5n torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ steps: From d6dbfb659b2eba4078bf3481d3261019c50c5a95 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 22:24:55 +0200 Subject: [PATCH 09/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 5b31a1b44ae1..ead7fb05ac1d 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -65,7 +65,7 @@ jobs: model: yolov5n torch: latest - os: ubuntu-latest - python-version: '3.9' + python-version: '3.8' # torch 1.7.0 requires python >=3.6, <=3.8 model: yolov5n torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ steps: From e0cf9de1a4bdf02fb8fdf189691fca69d38ce84e Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 22:40:19 +0200 Subject: [PATCH 10/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index ead7fb05ac1d..783ea266cfa8 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -83,16 +83,15 @@ jobs: path: ${{ steps.pip-cache.outputs.dir }} key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('requirements.txt') }} restore-keys: ${{ runner.os }}-${{ matrix.python-version }}-pip- - - name: Install torch==1.7.0 requirements - if: matrix.torch == '1.7.0' - run: | - python -m pip install --upgrade pip wheel - pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu - name: Install requirements - if: matrix.torch == 'latest' run: | python -m pip install --upgrade pip wheel - pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu + if [ "${{ matrix.torch }}" == "1.7.0" ]; then + pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu + else + pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu + fi + shell: bash # required for Windows compatibility - name: Check environment run: | python -c "import utils; utils.notebook_init()" From 542a1bdc5dfbd58082f293e7f0dd8bce2cbe5e47 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 22:44:41 +0200 Subject: [PATCH 11/23] Attempt crash on 1.7.0 --- utils/loggers/clearml/clearml_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/loggers/clearml/clearml_utils.py b/utils/loggers/clearml/clearml_utils.py index fb9889172562..86ce27d91f47 100644 --- a/utils/loggers/clearml/clearml_utils.py +++ b/utils/loggers/clearml/clearml_utils.py @@ -5,11 +5,11 @@ import yaml from torchvision.transforms import ToPILImage +from torchvision.utils import draw_bounding_boxes # WARNING: requires torchvision>=0.9.0 try: import clearml from clearml import Dataset, Task - from torchvision.utils import draw_bounding_boxes # WARNING: requires torchvision>=0.9.0 assert hasattr(clearml, '__version__') # verify package import not local dir except (ImportError, AssertionError): From 7ffb63881a1f35cb2ba5dd3dafeee4f4bbeeb39a Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 22:47:58 +0200 Subject: [PATCH 12/23] revert crash --- utils/loggers/clearml/clearml_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/loggers/clearml/clearml_utils.py b/utils/loggers/clearml/clearml_utils.py index 86ce27d91f47..fb9889172562 100644 --- a/utils/loggers/clearml/clearml_utils.py +++ b/utils/loggers/clearml/clearml_utils.py @@ -5,11 +5,11 @@ import yaml from torchvision.transforms import ToPILImage -from torchvision.utils import draw_bounding_boxes # WARNING: requires torchvision>=0.9.0 try: import clearml from clearml import Dataset, Task + from torchvision.utils import draw_bounding_boxes # WARNING: requires torchvision>=0.9.0 assert hasattr(clearml, '__version__') # verify package import not local dir except (ImportError, AssertionError): From 71b961ad5f021e0395c3522d2b7eddcc80ebf38b Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:22:09 +0200 Subject: [PATCH 13/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 783ea266cfa8..62f7f50ba8fa 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -3,6 +3,8 @@ name: YOLOv5 CI +env: + TORCH_LATEST: 1.12.1 on: push: branches: [master] @@ -48,18 +50,18 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] + torch: ["$TORCH_LATEST"] python-version: ['3.10'] model: [yolov5n] - torch: [latest] include: - os: ubuntu-latest + torch: torch-latest python-version: '3.7' # '3.6.8' min model: yolov5n - torch: latest - os: ubuntu-latest + torch: torch-latest python-version: '3.8' model: yolov5n - torch: latest - os: ubuntu-latest python-version: '3.9' model: yolov5n From 5ee2a90a2ee523ea1f662ad39d1fe79d66ad699c Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:24:58 +0200 Subject: [PATCH 14/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 62f7f50ba8fa..bc24e8e222cf 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - torch: ["$TORCH_LATEST"] + torch: [$TORCH_LATEST] python-version: ['3.10'] model: [yolov5n] include: From b622a98eff547cca368bc474c74c005568c097c3 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:25:29 +0200 Subject: [PATCH 15/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index bc24e8e222cf..4f7b0c3f9222 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - torch: [$TORCH_LATEST] + torch: [env.TORCH_LATEST] python-version: ['3.10'] model: [yolov5n] include: From cbf573bdea0c3523f57ad9616573831f4f131df7 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:27:33 +0200 Subject: [PATCH 16/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 4f7b0c3f9222..15fbdf1b01ba 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - torch: [env.TORCH_LATEST] + torch: ${{ env.TORCH_LATEST }} python-version: ['3.10'] model: [yolov5n] include: From 880ec828e089164885d747f75276eaf7a6fbb57a Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:29:17 +0200 Subject: [PATCH 17/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 15fbdf1b01ba..57beede5a5b3 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -4,7 +4,7 @@ name: YOLOv5 CI env: - TORCH_LATEST: 1.12.1 + TORCH_LATEST: '1.12.1' on: push: branches: [master] @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - torch: ${{ env.TORCH_LATEST }} + torch: [${{ env.TORCH_LATEST }}] python-version: ['3.10'] model: [yolov5n] include: From 887920bf5185ac31ef251ae85cbdab68fab8cf8c Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:30:38 +0200 Subject: [PATCH 18/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 57beede5a5b3..9ec65f8d5604 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - torch: [${{ env.TORCH_LATEST }}] + torch: [eval('env.TORCH_LATEST')] python-version: ['3.10'] model: [yolov5n] include: From 70a4fc1e0ede54640034c6ac5b637bd48372c365 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:32:46 +0200 Subject: [PATCH 19/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 9ec65f8d5604..41e5da6bb804 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -3,8 +3,6 @@ name: YOLOv5 CI -env: - TORCH_LATEST: '1.12.1' on: push: branches: [master] @@ -50,26 +48,23 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - torch: [eval('env.TORCH_LATEST')] + torch: [torch-latest] python-version: ['3.10'] model: [yolov5n] include: - os: ubuntu-latest - torch: torch-latest python-version: '3.7' # '3.6.8' min model: yolov5n - os: ubuntu-latest - torch: torch-latest python-version: '3.8' model: yolov5n - os: ubuntu-latest python-version: '3.9' model: yolov5n - torch: latest - os: ubuntu-latest + torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ python-version: '3.8' # torch 1.7.0 requires python >=3.6, <=3.8 model: yolov5n - torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 From a4ed17c724a4d64e016c3f58a9848a82ba8c0b5a Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:35:18 +0200 Subject: [PATCH 20/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 41e5da6bb804..31d38ead530f 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -48,7 +48,6 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - torch: [torch-latest] python-version: ['3.10'] model: [yolov5n] include: @@ -62,9 +61,9 @@ jobs: python-version: '3.9' model: yolov5n - os: ubuntu-latest - torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ python-version: '3.8' # torch 1.7.0 requires python >=3.6, <=3.8 model: yolov5n + torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 From a12e8e16c0c214debe66e3ce4fc8634dc9382be4 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:37:04 +0200 Subject: [PATCH 21/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 31d38ead530f..1502e0c6951b 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -63,7 +63,7 @@ jobs: - os: ubuntu-latest python-version: '3.8' # torch 1.7.0 requires python >=3.6, <=3.8 model: yolov5n - torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ + torch: 'torch-1.7.0' # min torch version CI https://pypi.org/project/torchvision/ steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -82,7 +82,7 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip wheel - if [ "${{ matrix.torch }}" == "1.7.0" ]; then + if [ "${{ matrix.torch }}" == "torch-1.7.0" ]; then pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu else pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu From e63a850ffbfdfb378b3b0274bea3ebcf98e5c11c Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:39:37 +0200 Subject: [PATCH 22/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index 1502e0c6951b..e2bd35c4a8b0 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -63,7 +63,7 @@ jobs: - os: ubuntu-latest python-version: '3.8' # torch 1.7.0 requires python >=3.6, <=3.8 model: yolov5n - torch: 'torch-1.7.0' # min torch version CI https://pypi.org/project/torchvision/ + torch: 'torch==1.7.0' # min torch version CI https://pypi.org/project/torchvision/ steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -82,7 +82,7 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip wheel - if [ "${{ matrix.torch }}" == "torch-1.7.0" ]; then + if [ "${{ matrix.torch }}" == "torch==1.7.0" ]; then pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu else pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu From fd53da776478e9f286d6d3d440db55dbe3887691 Mon Sep 17 00:00:00 2001 From: Glenn Jocher Date: Tue, 9 Aug 2022 23:46:16 +0200 Subject: [PATCH 23/23] Update ci-testing.yml --- .github/workflows/ci-testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-testing.yml b/.github/workflows/ci-testing.yml index e2bd35c4a8b0..31d38ead530f 100644 --- a/.github/workflows/ci-testing.yml +++ b/.github/workflows/ci-testing.yml @@ -63,7 +63,7 @@ jobs: - os: ubuntu-latest python-version: '3.8' # torch 1.7.0 requires python >=3.6, <=3.8 model: yolov5n - torch: 'torch==1.7.0' # min torch version CI https://pypi.org/project/torchvision/ + torch: '1.7.0' # min torch version CI https://pypi.org/project/torchvision/ steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -82,7 +82,7 @@ jobs: - name: Install requirements run: | python -m pip install --upgrade pip wheel - if [ "${{ matrix.torch }}" == "torch==1.7.0" ]; then + if [ "${{ matrix.torch }}" == "1.7.0" ]; then pip install -r requirements.txt torch==1.7.0 torchvision==0.8.1 --extra-index-url https://download.pytorch.org/whl/cpu else pip install -r requirements.txt --extra-index-url https://download.pytorch.org/whl/cpu