From 488ec49516cc2eb10d656b999b0dd05107dabc72 Mon Sep 17 00:00:00 2001
From: Huy Do <huydhn@gmail.com>
Date: Wed, 30 Aug 2023 11:50:29 -0700
Subject: [PATCH 1/3] [Release-Only] Branch Cut - Bump vision Version

---
 .github/workflows/build-cmake.yml             |  6 ++--
 .github/workflows/build-conda-linux.yml       |  9 +++---
 .github/workflows/build-conda-m1.yml          |  9 +++---
 .github/workflows/build-conda-macos.yml       |  7 +++--
 .github/workflows/build-conda-windows.yml     |  9 +++---
 .../workflows/build-wheels-aarch64-linux.yml  |  9 +++---
 .github/workflows/build-wheels-linux.yml      |  9 +++---
 .github/workflows/build-wheels-m1.yml         |  9 +++---
 .github/workflows/build-wheels-macos.yml      |  9 +++---
 .github/workflows/build-wheels-windows.yml    |  9 +++---
 .github/workflows/docs.yml                    | 22 +++++++-------
 .github/workflows/lint.yml                    | 29 +++++++++---------
 .../workflows/prototype-tests-linux-gpu.yml   |  4 +--
 .github/workflows/tests.yml                   | 30 +++++++++----------
 version.txt                                   |  2 +-
 15 files changed, 90 insertions(+), 82 deletions(-)

diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
index 3871dca340f..23f2b4b06ec 100644
--- a/.github/workflows/build-cmake.yml
+++ b/.github/workflows/build-cmake.yml
@@ -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 }}
@@ -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 }}
@@ -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 }}
diff --git a/.github/workflows/build-conda-linux.yml b/.github/workflows/build-conda-linux.yml
index a445ef9af25..f055d6eeb16 100644
--- a/.github/workflows/build-conda-linux.yml
+++ b/.github/workflows/build-conda-linux.yml
@@ -15,12 +15,13 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -34,13 +35,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 }}
diff --git a/.github/workflows/build-conda-m1.yml b/.github/workflows/build-conda-m1.yml
index 159a3c79a0d..897d6ecd354 100644
--- a/.github/workflows/build-conda-m1.yml
+++ b/.github/workflows/build-conda-m1.yml
@@ -15,12 +15,13 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -34,13 +35,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 }}
diff --git a/.github/workflows/build-conda-macos.yml b/.github/workflows/build-conda-macos.yml
index 6f4929e27e3..9948c655c61 100644
--- a/.github/workflows/build-conda-macos.yml
+++ b/.github/workflows/build-conda-macos.yml
@@ -15,12 +15,13 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -40,7 +41,7 @@ jobs:
       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 }}
diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml
index 968cb7007e5..bbbb54c5168 100644
--- a/.github/workflows/build-conda-windows.yml
+++ b/.github/workflows/build-conda-windows.yml
@@ -15,12 +15,13 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -34,13 +35,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 }}
diff --git a/.github/workflows/build-wheels-aarch64-linux.yml b/.github/workflows/build-wheels-aarch64-linux.yml
index 035800e9366..b25b111960b 100644
--- a/.github/workflows/build-wheels-aarch64-linux.yml
+++ b/.github/workflows/build-wheels-aarch64-linux.yml
@@ -15,13 +15,14 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -34,12 +35,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 }}
diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml
index e997d648ec2..06982adf15e 100644
--- a/.github/workflows/build-wheels-linux.yml
+++ b/.github/workflows/build-wheels-linux.yml
@@ -15,12 +15,13 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -33,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 }}
diff --git a/.github/workflows/build-wheels-m1.yml b/.github/workflows/build-wheels-m1.yml
index 66c7687acc9..fb4a8d0eaf5 100644
--- a/.github/workflows/build-wheels-m1.yml
+++ b/.github/workflows/build-wheels-m1.yml
@@ -15,12 +15,13 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -33,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_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 }}
diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml
index 6c5ebc0fc37..e39868f42e5 100644
--- a/.github/workflows/build-wheels-macos.yml
+++ b/.github/workflows/build-wheels-macos.yml
@@ -15,12 +15,13 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -33,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_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 }}
diff --git a/.github/workflows/build-wheels-windows.yml b/.github/workflows/build-wheels-windows.yml
index 3d818ece538..791f7e1d613 100644
--- a/.github/workflows/build-wheels-windows.yml
+++ b/.github/workflows/build-wheels-windows.yml
@@ -15,12 +15,13 @@ 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
+      channel: test
   build:
     needs: generate-matrix
     strategy:
@@ -34,12 +35,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 }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 779da13e3a2..724ee09a472 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -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
@@ -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)"
@@ -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.
@@ -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}"
@@ -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 }}
 
@@ -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
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8203bb61e4f..917bc54c832 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   python-source-and-configs:
-    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
       script: |
@@ -23,26 +23,26 @@ jobs:
         conda create --name ci --quiet --yes python=3.8 pip
         conda activate ci
         echo '::endgroup::'
-        
+
         echo '::group::Install lint tools'
         pip install --progress-bar=off pre-commit
         echo '::endgroup::'
-        
+
         set +e
         pre-commit run --all-files
-        
+
         if [ $? -ne 0 ]; then
           git --no-pager diff
           exit 1
         fi
 
   c-source:
-    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
       script: |
         set -euo pipefail
-        
+
         echo '::group::Setup environment'
         CONDA_PATH=$(which conda)
         eval "$(${CONDA_PATH} shell.bash hook)"
@@ -53,7 +53,7 @@ jobs:
         conda activate ci
         export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}"
         echo '::endgroup::'
-        
+
         echo '::group::Install lint tools'
         curl https://oss-clang-format.s3.us-east-2.amazonaws.com/linux64/clang-format-linux64 -o ./clang-format
         chmod +x ./clang-format
@@ -62,35 +62,34 @@ jobs:
         echo '::group::Lint C source'
         set +e
         ./.github/scripts/run-clang-format.py -r torchvision/csrc --clang-format-executable ./clang-format
-        
+
         if [ $? -ne 0 ]; then
           git --no-pager diff
           exit 1
         fi
         echo '::endgroup::'
 
-
   python-types:
-    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
       script: |
         set -euo pipefail
-        
+
         export PYTHON_VERSION=3.8
         export GPU_ARCH_TYPE=cpu
         export GPU_ARCH_VERSION=''
 
         ./.github/scripts/setup-env.sh
-        
+
         CONDA_PATH=$(which conda)
         eval "$(${CONDA_PATH} shell.bash hook)"
         conda activate ci
-        
+
         echo '::group::Install lint tools'
         pip install --progress-bar=off mypy
         echo '::endgroup::'
-        
+
         echo '::group::Lint Python types'
         mypy --install-types --non-interactive --config-file mypy.ini
         echo '::endgroup::'
@@ -100,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run BC Lint Action
-        uses: pytorch/test-infra/.github/actions/bc-lint@main
+        uses: pytorch/test-infra/.github/actions/bc-lint@release/2.1
         with:
           repo: ${{ github.event.pull_request.head.repo.full_name }}
           base_sha: ${{ github.event.pull_request.base.sha }}
diff --git a/.github/workflows/prototype-tests-linux-gpu.yml b/.github/workflows/prototype-tests-linux-gpu.yml
index dd850c14e87..10e51368b18 100644
--- a/.github/workflows/prototype-tests-linux-gpu.yml
+++ b/.github/workflows/prototype-tests-linux-gpu.yml
@@ -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 }}
@@ -34,7 +34,7 @@ jobs:
         export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
         export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
         ./.github/scripts/setup-env.sh
-        
+
         # Prepare conda
         CONDA_PATH=$(which conda)
         eval "$(${CONDA_PATH} shell.bash hook)"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 22e1a4ac18d..7c1a334e108 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -26,7 +26,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 }}
@@ -41,7 +41,7 @@ jobs:
         export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
 
         ./.github/scripts/unittest.sh
-        
+
   unittests-macos:
     strategy:
       matrix:
@@ -55,7 +55,7 @@ jobs:
           - python-version: "3.8"
             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
       # We need an increased timeout here, since the macos-12 runner is the free one from GH
@@ -87,7 +87,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 }}
@@ -102,11 +102,11 @@ jobs:
         export VSDEVCMD_ARGS=""
         export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
         export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
-        
+
         ./.github/scripts/unittest.sh
 
   onnx:
-    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
       script: |
@@ -117,26 +117,26 @@ jobs:
         export GPU_ARCH_VERSION=''
 
         ./.github/scripts/setup-env.sh
-        
+
         # Prepare conda
         CONDA_PATH=$(which conda)
         eval "$(${CONDA_PATH} shell.bash hook)"
         conda activate ci
-        
+
         echo '::group::Install ONNX'
         pip install --progress-bar=off onnx onnxruntime
         echo '::endgroup::'
-        
+
         echo '::group::Install testing utilities'
         pip install --progress-bar=off pytest
         echo '::endgroup::'
-        
+
         echo '::group::Run ONNX tests'
         pytest --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 test/test_onnx.py
         echo '::endgroup::'
 
   unittests-extended:
-    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
       script: |
@@ -147,21 +147,21 @@ jobs:
         export GPU_ARCH_VERSION=''
 
         ./.github/scripts/setup-env.sh
-        
+
         # Prepare conda
         CONDA_PATH=$(which conda)
         eval "$(${CONDA_PATH} shell.bash hook)"
         conda activate ci
-        
+
         echo '::group::Pre-download model weights'
         pip install --progress-bar=off aiohttp aiofiles tqdm
         python scripts/download_model_urls.py
         echo '::endgroup::'
-        
+
         echo '::group::Install testing utilities'
         pip install --progress-bar=off pytest
         echo '::endgroup::'
-        
+
         echo '::group::Run extended unittests'
         export PYTORCH_TEST_WITH_EXTENDED=1
         pytest --junit-xml="${RUNNER_TEST_RESULTS_DIR}/test-results.xml" -v --durations=25 test/test_extended_*.py
diff --git a/version.txt b/version.txt
index 5e0f9f3c735..04a373efe6b 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.16.0a0
+0.16.0

From 19e681d95ad41a8200eb6c22b2ef7f8e219ec529 Mon Sep 17 00:00:00 2001
From: Huy Do <huydhn@gmail.com>
Date: Wed, 30 Aug 2023 12:25:52 -0700
Subject: [PATCH 2/3] No need to set channel to test explicitly

---
 .github/workflows/build-conda-linux.yml          | 1 -
 .github/workflows/build-conda-m1.yml             | 1 -
 .github/workflows/build-conda-macos.yml          | 1 -
 .github/workflows/build-conda-windows.yml        | 1 -
 .github/workflows/build-wheels-aarch64-linux.yml | 1 -
 .github/workflows/build-wheels-linux.yml         | 1 -
 .github/workflows/build-wheels-m1.yml            | 1 -
 .github/workflows/build-wheels-macos.yml         | 1 -
 .github/workflows/build-wheels-windows.yml       | 1 -
 9 files changed, 9 deletions(-)

diff --git a/.github/workflows/build-conda-linux.yml b/.github/workflows/build-conda-linux.yml
index f055d6eeb16..8da9d488f7e 100644
--- a/.github/workflows/build-conda-linux.yml
+++ b/.github/workflows/build-conda-linux.yml
@@ -21,7 +21,6 @@ jobs:
       os: linux
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
-      channel: test
   build:
     needs: generate-matrix
     strategy:
diff --git a/.github/workflows/build-conda-m1.yml b/.github/workflows/build-conda-m1.yml
index 897d6ecd354..4a347e1baf5 100644
--- a/.github/workflows/build-conda-m1.yml
+++ b/.github/workflows/build-conda-m1.yml
@@ -21,7 +21,6 @@ jobs:
       os: macos-arm64
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
-      channel: test
   build:
     needs: generate-matrix
     strategy:
diff --git a/.github/workflows/build-conda-macos.yml b/.github/workflows/build-conda-macos.yml
index 9948c655c61..a54c3712110 100644
--- a/.github/workflows/build-conda-macos.yml
+++ b/.github/workflows/build-conda-macos.yml
@@ -21,7 +21,6 @@ jobs:
       os: macos
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
-      channel: test
   build:
     needs: generate-matrix
     strategy:
diff --git a/.github/workflows/build-conda-windows.yml b/.github/workflows/build-conda-windows.yml
index bbbb54c5168..f03e4c57fc1 100644
--- a/.github/workflows/build-conda-windows.yml
+++ b/.github/workflows/build-conda-windows.yml
@@ -21,7 +21,6 @@ jobs:
       os: windows
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
-      channel: test
   build:
     needs: generate-matrix
     strategy:
diff --git a/.github/workflows/build-wheels-aarch64-linux.yml b/.github/workflows/build-wheels-aarch64-linux.yml
index b25b111960b..30bcd395501 100644
--- a/.github/workflows/build-wheels-aarch64-linux.yml
+++ b/.github/workflows/build-wheels-aarch64-linux.yml
@@ -22,7 +22,6 @@ jobs:
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
       with-cuda: disable
-      channel: test
   build:
     needs: generate-matrix
     strategy:
diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml
index 06982adf15e..e04c7383eaa 100644
--- a/.github/workflows/build-wheels-linux.yml
+++ b/.github/workflows/build-wheels-linux.yml
@@ -21,7 +21,6 @@ jobs:
       os: linux
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
-      channel: test
   build:
     needs: generate-matrix
     strategy:
diff --git a/.github/workflows/build-wheels-m1.yml b/.github/workflows/build-wheels-m1.yml
index fb4a8d0eaf5..b4c4becc710 100644
--- a/.github/workflows/build-wheels-m1.yml
+++ b/.github/workflows/build-wheels-m1.yml
@@ -21,7 +21,6 @@ jobs:
       os: macos-arm64
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
-      channel: test
   build:
     needs: generate-matrix
     strategy:
diff --git a/.github/workflows/build-wheels-macos.yml b/.github/workflows/build-wheels-macos.yml
index e39868f42e5..f79ace74583 100644
--- a/.github/workflows/build-wheels-macos.yml
+++ b/.github/workflows/build-wheels-macos.yml
@@ -21,7 +21,6 @@ jobs:
       os: macos
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
-      channel: test
   build:
     needs: generate-matrix
     strategy:
diff --git a/.github/workflows/build-wheels-windows.yml b/.github/workflows/build-wheels-windows.yml
index 791f7e1d613..c9b3ebd72e7 100644
--- a/.github/workflows/build-wheels-windows.yml
+++ b/.github/workflows/build-wheels-windows.yml
@@ -21,7 +21,6 @@ jobs:
       os: windows
       test-infra-repository: pytorch/test-infra
       test-infra-ref: release/2.1
-      channel: test
   build:
     needs: generate-matrix
     strategy:

From 2342d6da855cea173b2dbe5f37d1519de4ba7360 Mon Sep 17 00:00:00 2001
From: Huy Do <huydhn@gmail.com>
Date: Wed, 30 Aug 2023 12:34:22 -0700
Subject: [PATCH 3/3] Replace few additional branch

---
 .github/workflows/build-conda-macos.yml   | 2 +-
 .github/workflows/update-viablestrict.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-conda-macos.yml b/.github/workflows/build-conda-macos.yml
index a54c3712110..aca1b12754c 100644
--- a/.github/workflows/build-conda-macos.yml
+++ b/.github/workflows/build-conda-macos.yml
@@ -34,7 +34,7 @@ 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 }}
diff --git a/.github/workflows/update-viablestrict.yml b/.github/workflows/update-viablestrict.yml
index 665d833b60a..ac81f3ff155 100644
--- a/.github/workflows/update-viablestrict.yml
+++ b/.github/workflows/update-viablestrict.yml
@@ -14,7 +14,7 @@ concurrency:
 
 jobs:
   do_update_viablestrict:
-    uses: pytorch/test-infra/.github/workflows/update-viablestrict.yml@main
+    uses: pytorch/test-infra/.github/workflows/update-viablestrict.yml@release/2.1
     with:
       repository: pytorch/vision
       required_checks: "Build Linux,Build M1,Build Macos,Build Windows,Tests,CMake,Lint,Docs"