From 679267e006fc13ed020de7afc1b2205eb92059a8 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Jun 2022 14:43:38 +0200 Subject: [PATCH 1/5] full eager --- .github/workflows/ci-pytorch_test-full.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 35f669cee508b..919de19ff6d15 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -78,13 +78,19 @@ jobs: - name: Pull legacy checkpoints run: bash .actions/pull_legacy_checkpoints.sh + - run: | + flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else '')" 2>&1) + url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')" 2>&1) + echo "PIP_FLAG=$flag" >> $GITHUB_ENV + echo "TORCH_URL="https://download.pytorch.org/whl/${url}" >> $GITHUB_ENV + - name: Install dependencies env: PACKAGE_NAME: pytorch run: | flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else '')" 2>&1) url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')" 2>&1) - pip install -e .[test] --upgrade $flag --find-links "https://download.pytorch.org/whl/${url}" + pip install -e .[test] $PIP_FLAG --find-links "$TORCH_URL" -U --upgrade-strategy eager pip list shell: bash @@ -96,7 +102,7 @@ jobs: run: | # adjust versions according installed Torch version python ./requirements/pytorch/adjust-versions.py requirements/pytorch/extra.txt - pip install --requirement ./requirements/pytorch/extra.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade + pip install $PIP_FLAG -r ./requirements/pytorch/extra.txt --find-links "$TORCH_URL" -U --upgrade-strategy eager pip list shell: bash @@ -142,7 +148,7 @@ jobs: run: | # adjust versions according installed Torch version python ./requirements/pytorch/adjust-versions.py requirements/pytorch/examples.txt - pip install -r requirements/pytorch/examples.txt --find-links https://download.pytorch.org/whl/cpu/torch_stable.html --upgrade + pip install $PIP_FLAG -r requirements/pytorch/examples.txt --find-links "$TORCH_URL --upgrade - name: Run Examples working-directory: ./examples From f95fcc0fb60daf6aab9cc97e79e404a17db09498 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Jun 2022 14:48:37 +0200 Subject: [PATCH 2/5] simple --- .github/workflows/ci-pytorch_test-full.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 919de19ff6d15..96e44382f8f72 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -88,8 +88,8 @@ jobs: env: PACKAGE_NAME: pytorch run: | - flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else '')" 2>&1) - url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')" 2>&1) + flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else '')") + url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')") pip install -e .[test] $PIP_FLAG --find-links "$TORCH_URL" -U --upgrade-strategy eager pip list shell: bash From feb709b51577c020202280b6f097fd7e05016136 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Jun 2022 14:51:57 +0200 Subject: [PATCH 3/5] typo --- .github/workflows/ci-pytorch_test-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 96e44382f8f72..9cff9baa24a4a 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -82,7 +82,7 @@ jobs: flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else '')" 2>&1) url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')" 2>&1) echo "PIP_FLAG=$flag" >> $GITHUB_ENV - echo "TORCH_URL="https://download.pytorch.org/whl/${url}" >> $GITHUB_ENV + echo "TORCH_URL=https://download.pytorch.org/whl/${url}" >> $GITHUB_ENV - name: Install dependencies env: From d38ba0abcb7870dfdb253ad915a50f422917db28 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Jun 2022 14:57:34 +0200 Subject: [PATCH 4/5] ... --- .github/workflows/ci-pytorch_test-full.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 9cff9baa24a4a..d902016e925df 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -79,8 +79,8 @@ jobs: run: bash .actions/pull_legacy_checkpoints.sh - run: | - flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else '')" 2>&1) - url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')" 2>&1) + flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else ' ')") + url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')") echo "PIP_FLAG=$flag" >> $GITHUB_ENV echo "TORCH_URL=https://download.pytorch.org/whl/${url}" >> $GITHUB_ENV From ae619b4c9a6ad029c14c1c7c89a5022f53055aa9 Mon Sep 17 00:00:00 2001 From: Jirka Date: Wed, 29 Jun 2022 15:08:20 +0200 Subject: [PATCH 5/5] win --- .github/workflows/ci-pytorch_test-full.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index d902016e925df..488f94c81e00b 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -79,10 +79,8 @@ jobs: run: bash .actions/pull_legacy_checkpoints.sh - run: | - flag=$(python -c "print('--pre' if '${{matrix.release}}' == 'pre' else ' ')") - url=$(python -c "print('test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html')") - echo "PIP_FLAG=$flag" >> $GITHUB_ENV - echo "TORCH_URL=https://download.pytorch.org/whl/${url}" >> $GITHUB_ENV + python -c "flag = '--pre' if '${{matrix.release}}' == 'pre' else ' ' ; print('PIP_FLAG=' + flag)" >> $GITHUB_ENV + python -c "url = 'test/cpu/torch_test.html' if '${{matrix.release}}' == 'pre' else 'cpu/torch_stable.html' ; print('TORCH_URL=' + url)" >> $GITHUB_ENV - name: Install dependencies env: