From 3133a1d3e7e13e5687963a356dd81d902742c7f1 Mon Sep 17 00:00:00 2001 From: Zhiqiang Wang Date: Mon, 13 Dec 2021 22:18:10 +0800 Subject: [PATCH 1/3] Cleanup unittest --- .github/workflows/ci-test.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 655a0ae4..f5967405 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -15,14 +15,14 @@ jobs: strategy: matrix: image: [ 'ubuntu-latest' ] - torch: [ 'torch 1.9.1+cpu', 'torch 1.10.0+cpu' ] + torch: [ '1.9.1+cpu', '1.10.0+cpu' ] include: - - torch: 'torch 1.9.1+cpu' + - torch: '1.9.1+cpu' torch_address: torch==1.9.1+cpu torchvision==0.10.1+cpu -f https://download.pytorch.org/whl/torch_stable.html unittest_type: --cov=test --cov-report=xml torchvision: release/0.10 - - torch: 'torch 1.10.0+cpu' - torch_address: install torch==1.10.0+cpu torchvision==0.11.1+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html + - torch: '1.10.0+cpu' + torch_address: torch==1.10.0+cpu torchvision==0.11.1+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html unittest_type: --cov=test --cov-report=xml torchvision: release/0.11 @@ -38,7 +38,7 @@ jobs: - name: Upgrade pip run: | # install pip=>20.1 to use "pip cache dir" - python -m pip install --progress-bar off --upgrade pip + python -m pip install --user --progress-bar off --upgrade pip - name: Get pip cache dir id: pip-cache @@ -52,23 +52,23 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - name: Install PyTorch ${{ matrix.torch }} Version + - name: Install PyTorch ${{ matrix.torch }} run: | # requirements for PyTorch and torchvision - pip install --progress-bar off numpy pillow scipy - pip install --progress-bar off ${{ matrix.torch_address }} + pip install --user --progress-bar off numpy pillow scipy + pip install --user --progress-bar off ${{ matrix.torch_address }} - name: Install dependencies run: | # requirements for unittest - pip install --progress-bar off flake8 pytest - pip install --progress-bar off pytest-cov + pip install --user --progress-bar off flake8 pytest + pip install --user --progress-bar off pytest-cov # Install other dependencies - if [ -f requirements.txt ]; then pip install --progress-bar off -r requirements.txt; fi - pip install --progress-bar off opencv-python - pip install --progress-bar off pycocotools>=2.0.2 - pip install --progress-bar off onnxruntime - pip install onnx_graphsurgeon --index-url https://pypi.ngc.nvidia.com + if [ -f requirements.txt ]; then pip install --user --progress-bar off -r requirements.txt; fi + pip install --user --progress-bar off opencv-python + pip install --user --progress-bar off pycocotools>=2.0.2 + pip install --user --progress-bar off onnxruntime + pip install --user onnx_graphsurgeon --index-url https://pypi.ngc.nvidia.com - name: Lint with flake8 run: | From b4226c95af9ffd0b1451279384cde8abb126de0e Mon Sep 17 00:00:00 2001 From: Zhiqiang Wang Date: Mon, 13 Dec 2021 22:21:54 +0800 Subject: [PATCH 2/3] Update Copyright --- .github/workflows/ci-test.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index f5967405..973a1728 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -1,5 +1,4 @@ -# Copyright (c) 2020, Zhiqiang Wang. All Rights Reserved. -# GH actions +# Copyright (c) 2020, yolort team. All rights reserved. name: CI testing From 5e22e75d678b5e8d1d91c1d35323a13bf407e972 Mon Sep 17 00:00:00 2001 From: Zhiqiang Wang Date: Mon, 13 Dec 2021 23:05:12 +0800 Subject: [PATCH 3/3] Rename matrix.torch --- .github/workflows/ci-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index 973a1728..b9bba3c1 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -14,13 +14,13 @@ jobs: strategy: matrix: image: [ 'ubuntu-latest' ] - torch: [ '1.9.1+cpu', '1.10.0+cpu' ] + torch: [ 'PyTorch 1.9.1+cpu', 'PyTorch 1.10.0+cpu' ] include: - - torch: '1.9.1+cpu' + - torch: 'PyTorch 1.9.1+cpu' torch_address: torch==1.9.1+cpu torchvision==0.10.1+cpu -f https://download.pytorch.org/whl/torch_stable.html unittest_type: --cov=test --cov-report=xml torchvision: release/0.10 - - torch: '1.10.0+cpu' + - torch: 'PyTorch 1.10.0+cpu' torch_address: torch==1.10.0+cpu torchvision==0.11.1+cpu -f https://download.pytorch.org/whl/cpu/torch_stable.html unittest_type: --cov=test --cov-report=xml torchvision: release/0.11 @@ -51,7 +51,7 @@ jobs: restore-keys: | ${{ runner.os }}-pip- - - name: Install PyTorch ${{ matrix.torch }} + - name: Install ${{ matrix.torch }} run: | # requirements for PyTorch and torchvision pip install --user --progress-bar off numpy pillow scipy @@ -91,7 +91,7 @@ jobs: fail_ci_if_error: true verbose: true - - name: Build TorchVision Cpp ${{ matrix.torch }} + - name: Build LibTorchVision for ${{ matrix.torch }} run: | export TORCH_PATH=$(dirname $(python -c "import torch; print(torch.__file__)")) cd ..