Merge branch 'main' of github.com:pytorch/vision into webp_decoder

pytorch · Aug 12, 2024 · 2fdbdbf · 2fdbdbf
2 parents d32bf25 + 8f73afa
commit 2fdbdbf
Show file tree

Hide file tree

Showing 34 changed files with 1,472 additions and 833 deletions.
diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml
@@ -1,85 +1,85 @@
-# name: CMake
+name: CMake
 
-# on:
-#   pull_request:
-#   push:
-#     branches:
-#       - nightly
-#       - main
-#       - release/*
-#   workflow_dispatch:
+on:
+  pull_request:
+  push:
+    branches:
+      - nightly
+      - main
+      - release/*
+  workflow_dispatch:
 
-# jobs:
-#   linux:
-#     strategy:
-#       matrix:
-#         include:
-#           - runner: linux.12xlarge
-#             gpu-arch-type: cpu
-#           - runner: linux.g5.4xlarge.nvidia.gpu
-#             gpu-arch-type: cuda
-#             gpu-arch-version: "11.8"
-#       fail-fast: false
-#     uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
-#     with:
-#       repository: pytorch/vision
-#       runner: ${{ matrix.runner }}
-#       gpu-arch-type: ${{ matrix.gpu-arch-type }}
-#       gpu-arch-version: ${{ matrix.gpu-arch-version }}
-#       test-infra-ref: main
-#       script: |
-#         set -euo pipefail
+jobs:
+  linux:
+    strategy:
+      matrix:
+        include:
+          - runner: linux.12xlarge
+            gpu-arch-type: cpu
+          - runner: linux.g5.4xlarge.nvidia.gpu
+            gpu-arch-type: cuda
+            gpu-arch-version: "11.8"
+      fail-fast: false
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    with:
+      repository: pytorch/vision
+      runner: ${{ matrix.runner }}
+      gpu-arch-type: ${{ matrix.gpu-arch-type }}
+      gpu-arch-version: ${{ matrix.gpu-arch-version }}
+      test-infra-ref: main
+      script: |
+        set -euo pipefail
 
-#         export PYTHON_VERSION=3.8
-#         export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
-#         export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
+        export PYTHON_VERSION=3.8
+        export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
+        export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
 
-#         ./.github/scripts/cmake.sh
+        ./.github/scripts/cmake.sh
 
-#   macos:
-#     strategy:
-#       matrix:
-#         include:
-#           - runner: macos-m1-stable
-#       fail-fast: false
-#     uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
-#     with:
-#       repository: pytorch/vision
-#       runner: ${{ matrix.runner }}
-#       test-infra-ref: main
-#       script: |
-#         set -euo pipefail
+  macos:
+    strategy:
+      matrix:
+        include:
+          - runner: macos-m1-stable
+      fail-fast: false
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
+    with:
+      repository: pytorch/vision
+      runner: ${{ matrix.runner }}
+      test-infra-ref: main
+      script: |
+        set -euo pipefail
 
-#         export PYTHON_VERSION=3.8
-#         export GPU_ARCH_TYPE=cpu
-#         export GPU_ARCH_VERSION=''
+        export PYTHON_VERSION=3.8
+        export GPU_ARCH_TYPE=cpu
+        export GPU_ARCH_VERSION=''
 
-#         ${CONDA_RUN} ./.github/scripts/cmake.sh
+        ${CONDA_RUN} ./.github/scripts/cmake.sh
 
-#   windows:
-#     strategy:
-#       matrix:
-#         include:
-#           - runner: windows.4xlarge
-#             gpu-arch-type: cpu
-#           - runner: windows.g5.4xlarge.nvidia.gpu
-#             gpu-arch-type: cuda
-#             gpu-arch-version: "11.8"
-#       fail-fast: false
-#     uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
-#     with:
-#       repository: pytorch/vision
-#       runner: ${{ matrix.runner }}
-#       gpu-arch-type: ${{ matrix.gpu-arch-type }}
-#       gpu-arch-version: ${{ matrix.gpu-arch-version }}
-#       test-infra-ref: main
-#       script: |
-#         set -euo pipefail
+  windows:
+    strategy:
+      matrix:
+        include:
+          - runner: windows.4xlarge
+            gpu-arch-type: cpu
+          - runner: windows.g5.4xlarge.nvidia.gpu
+            gpu-arch-type: cuda
+            gpu-arch-version: "11.8"
+      fail-fast: false
+    uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
+    with:
+      repository: pytorch/vision
+      runner: ${{ matrix.runner }}
+      gpu-arch-type: ${{ matrix.gpu-arch-type }}
+      gpu-arch-version: ${{ matrix.gpu-arch-version }}
+      test-infra-ref: main
+      script: |
+        set -euo pipefail
 
-#         export PYTHON_VERSION=3.8
-#         export VC_YEAR=2022
-#         export VSDEVCMD_ARGS=""
-#         export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
-#         export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
+        export PYTHON_VERSION=3.8
+        export VC_YEAR=2022
+        export VSDEVCMD_ARGS=""
+        export GPU_ARCH_TYPE=${{ matrix.gpu-arch-type }}
+        export GPU_ARCH_VERSION=${{ matrix.gpu-arch-version }}
 
-#         ./.github/scripts/cmake.sh
+        ./.github/scripts/cmake.sh
diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml
@@ -1,51 +1,52 @@
-# name: Build Linux Wheels
+name: Build Linux Wheels
 
-# on:
-#   pull_request:
-#   push:
-#     branches:
-#       - nightly
-#       - main
-#       - release/*
-#     tags:
-#         # NOTE: Binary build pipelines should only get triggered on release candidate builds
-#         # Release candidate tags look like: v1.11.0-rc1
-#         - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
-#   workflow_dispatch:
+on:
+  pull_request:
+  push:
+    branches:
+      - nightly
+      - main
+      - release/*
+    tags:
+        # NOTE: Binary build pipelines should only get triggered on release candidate builds
+        # Release candidate tags look like: v1.11.0-rc1
+        - v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+
+  workflow_dispatch:
 
-# permissions:
-#   id-token: write
-#   contents: read
+permissions:
+  id-token: write
+  contents: read
 
-# jobs:
-#   generate-matrix:
-#     uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
-#     with:
-#       package-type: wheel
-#       os: linux
-#       test-infra-repository: pytorch/test-infra
-#       test-infra-ref: main
-#   build:
-#     needs: generate-matrix
-#     strategy:
-#       fail-fast: false
-#       matrix:
-#         include:
-#           - repository: pytorch/vision
-#             pre-script: packaging/pre_build_script.sh
-#             post-script: packaging/post_build_script.sh
-#             smoke-test-script: test/smoke_test.py
-#             package-name: torchvision
-#     name: ${{ matrix.repository }}
-#     uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
-#     with:
-#       repository: ${{ matrix.repository }}
-#       ref: ""
-#       test-infra-repository: pytorch/test-infra
-#       test-infra-ref: main
-#       build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
-#       pre-script: ${{ matrix.pre-script }}
-#       post-script: ${{ matrix.post-script }}
-#       package-name: ${{ matrix.package-name }}
-#       smoke-test-script: ${{ matrix.smoke-test-script }}
-#       trigger-event: ${{ github.event_name }}
+jobs:
+  generate-matrix:
+    uses: pytorch/test-infra/.github/workflows/generate_binary_build_matrix.yml@main
+    with:
+      package-type: wheel
+      os: linux
+      test-infra-repository: pytorch/test-infra
+      test-infra-ref: main
+      with-xpu: enable
+  build:
+    needs: generate-matrix
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - repository: pytorch/vision
+            pre-script: packaging/pre_build_script.sh
+            post-script: packaging/post_build_script.sh
+            smoke-test-script: test/smoke_test.py
+            package-name: torchvision
+    name: ${{ matrix.repository }}
+    uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
+    with:
+      repository: ${{ matrix.repository }}
+      ref: ""
+      test-infra-repository: pytorch/test-infra
+      test-infra-ref: main
+      build-matrix: ${{ needs.generate-matrix.outputs.matrix }}
+      pre-script: ${{ matrix.pre-script }}
+      post-script: ${{ matrix.post-script }}
+      package-name: ${{ matrix.package-name }}
+      smoke-test-script: ${{ matrix.smoke-test-script }}
+      trigger-event: ${{ github.event_name }}