Merge branch 'pytorch:main' into main

Author: jamesmuking5

.github/scripts/cmake.sh

@@ -30,6 +30,10 @@ else
   JOBS=$(nproc)
 fi
 
+if [[ $OS_TYPE == linux ]]; then
+  export LD_LIBRARY_PATH="${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}"
+fi
+
 TORCH_PATH=$(python -c "import pathlib, torch; print(pathlib.Path(torch.__path__[0]))")
 if [[ $OS_TYPE == windows ]]; then
   PACKAGING_DIR="${PWD}/packaging"

.github/scripts/export_IS_M1_CONDA_BUILD_JOB.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+export IS_M1_CONDA_BUILD_JOB=1

.github/scripts/setup-env.sh

@@ -30,10 +30,11 @@ conda create \
   python="${PYTHON_VERSION}" pip \
   ninja cmake \
   libpng \
+  libwebp \
   'ffmpeg<4.3'
 conda activate ci
 conda install --quiet --yes libjpeg-turbo -c pytorch
-pip install --progress-bar=off --upgrade setuptools
+pip install --progress-bar=off --upgrade setuptools==72.1.0
 
 # See https://github.com/pytorch/vision/issues/6790
 if [[ "${PYTHON_VERSION}" != "3.11" ]]; then
@@ -44,11 +45,7 @@ echo '::endgroup::'
 
 if [[ "${OS_TYPE}" == windows && "${GPU_ARCH_TYPE}" == cuda ]]; then
   echo '::group::Install VisualStudio CUDA extensions on Windows'
-  if [[ "${VC_YEAR:-}" == "2022" ]]; then
-    TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
-  else
-    TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/MSBuild/Microsoft/VC/v160/BuildCustomizations"
-  fi
+  TARGET_DIR="/c/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Microsoft/VC/v170/BuildCustomizations"
   mkdir -p "${TARGET_DIR}"
   cp -r "${CUDA_HOME}/MSBuildExtensions/"* "${TARGET_DIR}"
   echo '::endgroup::'
@@ -101,6 +98,11 @@ echo '::group::Install TorchVision'
 python setup.py develop
 echo '::endgroup::'
 
+echo '::group::Install torchvision-extra-decoders'
+# This can be done after torchvision was built
+pip install torchvision-extra-decoders
+echo '::endgroup::'
+
 echo '::group::Collect environment information'
 conda list
 python -m torch.utils.collect_env

.github/workflows/build-cmake.yml

@@ -20,7 +20,10 @@ 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_v2.yml@main
+    permissions:
+      id-token: write
+      contents: read
     with:
       repository: pytorch/vision
       runner: ${{ matrix.runner }}
@@ -30,10 +33,9 @@ jobs:
       script: |
         set -euo pipefail
 
-        export PYTHON_VERSION=3.8
+        export PYTHON_VERSION=3.9
         export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
         export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
-
         ./.github/scripts/cmake.sh
 
   macos:
@@ -50,7 +52,7 @@ jobs:
       script: |
         set -euo pipefail
 
-        export PYTHON_VERSION=3.8
+        export PYTHON_VERSION=3.9
         export GPU_ARCH_TYPE=cpu
         export GPU_ARCH_VERSION=''
 
@@ -76,7 +78,7 @@ jobs:
       script: |
         set -euo pipefail
 
-        export PYTHON_VERSION=3.8
+        export PYTHON_VERSION=3.9
         export VC_YEAR=2022
         export VSDEVCMD_ARGS=""
         export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}

.github/workflows/build-conda-linux.yml

@@ -25,6 +25,7 @@ jobs:
       os: linux
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
+      with-xpu: enable
   build:
     needs: generate-matrix
     strategy:

.github/workflows/build-conda-m1.yml

@@ -25,6 +25,7 @@ jobs:
       os: windows
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
+      with-xpu: enable
   build:
     needs: generate-matrix
     strategy:

.github/workflows/build-conda-windows.yml

@@ -14,15 +14,18 @@ on:
 
 jobs:
   build:
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
+    permissions:
+      id-token: write
+      contents: read
     with:
       repository: pytorch/vision
       upload-artifact: docs
       test-infra-ref: main
       script: |
         set -euo pipefail
 
-        export PYTHON_VERSION=3.8
+        export PYTHON_VERSION=3.10
         export GPU_ARCH_TYPE=cpu
         export GPU_ARCH_VERSION=''
         ./.github/scripts/setup-env.sh
@@ -57,7 +60,7 @@ jobs:
         sed -i -e 's/-j auto/-j 1/' Makefile
         make html
 
-        # Below is an imperfect way for us to add "try on collab" links to all of our gallery examples.
+        # Below is an imperfect way for us to add "try on Colab" links to all of our gallery examples.
         # sphinx-gallery will convert all gallery examples to .ipynb notebooks and stores them in
         # build/html/_downloads/<some_hash>/<example_name>.ipynb
         # We copy all those ipynb files in a more convenient folder so that we can more easily link to them.
@@ -77,11 +80,12 @@ jobs:
 
   upload:
     needs: build
-    if: github.repository == 'pytorch/vision' && github.event_name == 'push' && 
+    if: github.repository == 'pytorch/vision' && github.event_name == 'push' &&
         ((github.ref_type == 'branch' && github.ref_name == 'main') || github.ref_type == 'tag')
+    uses: pytorch/test-infra/.github/workflows/linux_job_v2.yml@main
     permissions:
+      id-token: write
       contents: write
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
     with:
       repository: pytorch/vision
       download-artifact: docs