Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build-cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
gpu-arch-type: cuda
gpu-arch-version: "11.8"
fail-fast: false
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.1
with:
repository: pytorch/vision
runner: ${{ matrix.runner }}
Expand All @@ -42,7 +42,7 @@ jobs:
- runner: macos-12
- runner: macos-m1-12
fail-fast: false
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.1
with:
repository: pytorch/vision
runner: ${{ matrix.runner }}
Expand All @@ -65,7 +65,7 @@ jobs:
gpu-arch-type: cuda
gpu-arch-version: "11.8"
fail-fast: false
uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
uses: pytorch/test-infra/.github/workflows/windows_job.yml@release/2.1
with:
repository: pytorch/vision
runner: ${{ matrix.runner }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-conda-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: conda
os: linux
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build:
needs: generate-matrix
strategy:
Expand All @@ -34,13 +34,13 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@main
uses: pytorch/test-infra/.github/workflows/build_conda_linux.yml@release/2.1
with:
conda-package-directory: ${{ matrix.conda-package-directory }}
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-conda-m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: conda
os: macos-arm64
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build:
needs: generate-matrix
strategy:
Expand All @@ -34,13 +34,13 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@main
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@release/2.1
with:
conda-package-directory: ${{ matrix.conda-package-directory }}
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-conda-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: conda
os: macos
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build:
needs: generate-matrix
strategy:
Expand All @@ -34,13 +34,13 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@main
uses: pytorch/test-infra/.github/workflows/build_conda_macos.yml@release/2.1
with:
conda-package-directory: ${{ matrix.conda-package-directory }}
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-conda-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: conda
os: windows
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build:
needs: generate-matrix
strategy:
Expand All @@ -34,13 +34,13 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@main
uses: pytorch/test-infra/.github/workflows/build_conda_windows.yml@release/2.1
with:
conda-package-directory: ${{ matrix.conda-package-directory }}
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-aarch64-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: wheel
os: linux-aarch64
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
with-cuda: disable
build:
needs: generate-matrix
Expand All @@ -34,12 +34,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.1
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: wheel
os: linux
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build:
needs: generate-matrix
strategy:
Expand All @@ -33,12 +33,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@release/2.1
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-m1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: wheel
os: macos-arm64
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build:
needs: generate-matrix
strategy:
Expand All @@ -33,12 +33,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.1
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: wheel
os: macos
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build:
needs: generate-matrix
strategy:
Expand All @@ -33,12 +33,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@release/2.1
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
post-script: ${{ matrix.post-script }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-wheels-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ on:

jobs:
generate-matrix:
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@release/2.1
with:
package-type: wheel
os: windows
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build:
needs: generate-matrix
strategy:
Expand All @@ -34,12 +34,12 @@ jobs:
smoke-test-script: test/smoke_test.py
package-name: torchvision
name: ${{ matrix.repository }}
uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main
uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@release/2.1
with:
repository: ${{ matrix.repository }}
ref: ""
test-infra-repository: pytorch/test-infra
test-infra-ref: main
test-infra-ref: release/2.1
build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
pre-script: ${{ matrix.pre-script }}
env-script: ${{ matrix.env-script }}
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:

jobs:
build:
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.1
with:
repository: pytorch/vision
upload-artifact: docs
Expand All @@ -25,7 +25,7 @@ jobs:
export GPU_ARCH_TYPE=cpu
export GPU_ARCH_VERSION=''
./.github/scripts/setup-env.sh

# Prepare conda
CONDA_PATH=$(which conda)
eval "$(${CONDA_PATH} shell.bash hook)"
Expand All @@ -36,13 +36,13 @@ jobs:
# Should we maybe always do this in `./.github/scripts/setup-env.sh` so that we don't
# have to pay attention in all other workflows?
export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}"

cd docs

echo '::group::Install doc requirements'
pip install --progress-bar=off -r requirements.txt
echo '::endgroup::'

if [[ ${{ github.event_name }} == push && (${{ github.ref_type }} == tag || (${{ github.ref_type }} == branch && ${{ github.ref_name }} == release/*)) ]]; then
echo '::group::Enable version string sanitization'
# This environment variable just has to exist and must not be empty. The actual value is arbitrary.
Expand All @@ -66,9 +66,9 @@ jobs:
cp $file build/html/_generated_ipynb_notebooks/
fi
done

cp -r build/html "${RUNNER_ARTIFACT_DIR}"

# On PRs we also want to upload the docs into our S3 bucket for preview.
if [[ ${{ github.event_name == 'pull_request' }} ]]; then
cp -r build/html/* "${RUNNER_DOCS_DIR}"
Expand All @@ -80,14 +80,14 @@ jobs:
((github.ref_type == 'branch' && github.ref_name == 'main') || github.ref_type == 'tag')
permissions:
contents: write
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.1
with:
repository: pytorch/vision
download-artifact: docs
ref: gh-pages
script: |
set -euo pipefail

REF_TYPE=${{ github.ref_type }}
REF_NAME=${{ github.ref_name }}

Expand All @@ -112,14 +112,14 @@ jobs:
rm -rf "${TARGET_FOLDER}"/*
mv "${RUNNER_ARTIFACT_DIR}"/html/* "${TARGET_FOLDER}"
git add "${TARGET_FOLDER}" || true

if [[ "${TARGET_FOLDER}" == main ]]; then
mkdir -p _static
rm -rf _static/*
cp -r "${TARGET_FOLDER}"/_static/* _static
git add _static || true
fi

git config user.name 'pytorchbot'
git config user.email 'soumith+bot@pytorch.org'
git config http.postBuffer 524288000
Expand Down
Loading