[2.6 RELEASE] Update PyTorch pin to 2.6 (#7368)

pytorch · Dec 20, 2024 · 57d86d7 · 57d86d7
1 parent e2277ac
commit 57d86d7
Show file tree

Hide file tree

Showing 22 changed files with 114 additions and 103 deletions.
diff --git a/.ci/docker/ci_commit_pins/pytorch.txt b/.ci/docker/ci_commit_pins/pytorch.txt
@@ -1 +1 @@
-19eff28ff3f19b50da46f5a9ff5f4d4d213806fe
+release/2.6
diff --git a/.github/workflows/_android.yml b/.github/workflows/_android.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   build-llm-demo:
     name: build-llm-demo
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     with:
       runner: linux.2xlarge
       docker-image: executorch-ubuntu-22.04-clang12-android
@@ -38,7 +38,7 @@ jobs:
       API_LEVEL: 34
     steps:
       - name: Setup SSH (Click me for login details)
-        uses: pytorch/test-infra/.github/actions/setup-ssh@main
+        uses: pytorch/test-infra/.github/actions/setup-ssh@release/2.6
         with:
           github-secret: ${{ secrets.GITHUB_TOKEN }}
           instructions: |
@@ -49,7 +49,7 @@ jobs:
           submodules: false
 
       - name: Setup conda
-        uses: pytorch/test-infra/.github/actions/setup-miniconda@main
+        uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.6
         with:
           python-version: '3.10'
 

diff --git a/.github/workflows/_unittest.yml b/.github/workflows/_unittest.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   linux:
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     with:
       runner: linux.2xlarge
       docker-image: ${{ inputs.docker-image }}
@@ -47,7 +47,7 @@ jobs:
         test/run_oss_cpp_tests.sh
 
   macos:
-    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.6
     with:
       runner: macos-m1-stable
       python-version: '3.11'

diff --git a/.github/workflows/android-perf.yml b/.github/workflows/android-perf.yml
@@ -166,7 +166,7 @@ jobs:
 
   export-models:
     name: export-models
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     needs: set-parameters
     strategy:
       matrix:
@@ -226,7 +226,7 @@ jobs:
 
   build-benchmark-app:
     name: build-benchmark-app
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     needs: set-parameters
     with:
       runner: linux.2xlarge
@@ -257,7 +257,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    uses: pytorch/test-infra/.github/workflows/mobile_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/mobile_job.yml@release/2.6
     needs:
       - set-parameters
       - prepare-test-specs
@@ -305,7 +305,7 @@ jobs:
           aws-region: us-east-1
 
       - name: Setup conda
-        uses: pytorch/test-infra/.github/actions/setup-miniconda@main
+        uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.6
         with:
           python-version: '3.10'
 
@@ -353,14 +353,14 @@ jobs:
 
       # TODO (huydhn): Remove v2 schema once the benchmark dashboard finishes the migration
       - name: Upload the benchmark results (v2)
-        uses: pytorch/test-infra/.github/actions/upload-benchmark-results@main
+        uses: pytorch/test-infra/.github/actions/upload-benchmark-results@release/2.6
         with:
           benchmark-results-dir: benchmark-results/v2
           dry-run: false
           schema-version: v2
 
       - name: Upload the benchmark results (v3)
-        uses: pytorch/test-infra/.github/actions/upload-benchmark-results@main
+        uses: pytorch/test-infra/.github/actions/upload-benchmark-results@release/2.6
         with:
           benchmark-results-dir: benchmark-results/v3
           dry-run: false

diff --git a/.github/workflows/android-release-artifacts.yml b/.github/workflows/android-release-artifacts.yml
@@ -31,7 +31,7 @@ jobs:
   build-aar:
     name: build-aar
     needs: check-if-aar-exists
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     with:
       runner: linux.2xlarge
       docker-image: executorch-ubuntu-22.04-clang12-android

diff --git a/.github/workflows/apple-perf.yml b/.github/workflows/apple-perf.yml
@@ -153,7 +153,7 @@ jobs:
 
   export-models:
     name: export-models
-    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.6
     needs: set-parameters
     strategy:
       matrix:
@@ -228,7 +228,7 @@ jobs:
 
   build-benchmark-app:
     name: build-benchmark-app
-    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.6
     needs:
       - set-parameters
     secrets: inherit
@@ -334,7 +334,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    uses: pytorch/test-infra/.github/workflows/mobile_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/mobile_job.yml@release/2.6
     strategy:
       matrix:
         model: ${{ fromJson(needs.set-parameters.outputs.models) }}
@@ -379,7 +379,7 @@ jobs:
           aws-region: us-east-1
 
       - name: Setup conda
-        uses: pytorch/test-infra/.github/actions/setup-miniconda@main
+        uses: pytorch/test-infra/.github/actions/setup-miniconda@release/2.6
         with:
           python-version: '3.10'
 
@@ -427,14 +427,14 @@ jobs:
 
       # TODO (huydhn): Remove v2 schema once the benchmark dashboard finishes the migration
       - name: Upload the benchmark results (v2)
-        uses: pytorch/test-infra/.github/actions/upload-benchmark-results@main
+        uses: pytorch/test-infra/.github/actions/upload-benchmark-results@release/2.6
         with:
           benchmark-results-dir: benchmark-results/v2
           dry-run: false
           schema-version: v2
 
       - name: Upload the benchmark results (v3)
-        uses: pytorch/test-infra/.github/actions/upload-benchmark-results@main
+        uses: pytorch/test-infra/.github/actions/upload-benchmark-results@release/2.6
         with:
           benchmark-results-dir: benchmark-results/v3
           dry-run: false

diff --git a/.github/workflows/apple.yml b/.github/workflows/apple.yml
@@ -44,7 +44,7 @@ jobs:
     name: build-demo-ios
     # NB: Don't run this on fork PRs because they won't have access to the secret and would fail anyway
     if: ${{ !github.event.pull_request.head.repo.fork }}
-    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.6
     secrets: inherit
     with:
       runner: macos-latest-xlarge
@@ -114,7 +114,7 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    uses: pytorch/test-infra/.github/workflows/mobile_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/mobile_job.yml@release/2.6
     with:
       device-type: ios
       # For iOS testing, the runner just needs to call AWS Device Farm, so there is no need to run this on macOS
@@ -132,7 +132,7 @@ jobs:
   build-frameworks-ios:
     name: build-frameworks-ios
     needs: set-version
-    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.6
     with:
       runner: macos-latest-xlarge
       python-version: '3.11'
@@ -284,7 +284,7 @@ jobs:
     name: build-benchmark-app
     # NB: Don't run this on fork PRs because they won't have access to the secret and would fail anyway
     if: ${{ !github.event.pull_request.head.repo.fork }}
-    uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/macos_job.yml@release/2.6
     secrets: inherit
     with:
       runner: macos-latest-xlarge

diff --git a/.github/workflows/build-wheels-linux.yml b/.github/workflows/build-wheels-linux.yml
@@ -19,7 +19,7 @@ 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.6
     with:
       package-type: wheel
       os: linux
@@ -44,7 +44,7 @@ jobs:
             smoke-test-script: build/packaging/smoke_test.py
             package-name: executorch
     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.6
     with:
       repository: ${{ matrix.repository }}
       ref: ""

diff --git a/.github/workflows/build-wheels-m1.yml b/.github/workflows/build-wheels-m1.yml
@@ -19,7 +19,7 @@ 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.6
     with:
       package-type: wheel
       os: macos-arm64
@@ -44,7 +44,7 @@ jobs:
             smoke-test-script: build/packaging/smoke_test.py
             package-name: executorch
     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.6
     with:
       repository: ${{ matrix.repository }}
       ref: ""

diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
@@ -15,7 +15,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.6
     strategy:
       matrix:
         include:
@@ -82,7 +82,7 @@ jobs:
     if: github.repository == 'pytorch/executorch' && github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
     permissions:
       contents: write
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     with:
       repository: pytorch/executorch
       download-artifact: docs

diff --git a/.github/workflows/docker-builds.yml b/.github/workflows/docker-builds.yml
@@ -51,25 +51,25 @@ jobs:
           mkdir "${GITHUB_WORKSPACE}"
 
       - name: Setup SSH (Click me for login details)
-        uses: pytorch/test-infra/.github/actions/setup-ssh@main
+        uses: pytorch/test-infra/.github/actions/setup-ssh@release/2.6
         with:
           github-secret: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Checkout Executorch
         uses: actions/checkout@v3
 
       - name: Setup Linux
-        uses: pytorch/test-infra/.github/actions/setup-linux@main
+        uses: pytorch/test-infra/.github/actions/setup-linux@release/2.6
 
       - name: Build docker image
         id: build-docker-image
-        uses: pytorch/test-infra/.github/actions/calculate-docker-image@main
+        uses: pytorch/test-infra/.github/actions/calculate-docker-image@release/2.6
         with:
           docker-image-name: ${{ matrix.docker-image-name }}
           always-rebuild: true
           push: true
           force-push: true
 
       - name: Teardown Linux
-        uses: pytorch/test-infra/.github/actions/teardown-linux@main
+        uses: pytorch/test-infra/.github/actions/teardown-linux@release/2.6
         if: always()
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ concurrency:
 
 jobs:
   lintrunner:
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     with:
       runner: linux.2xlarge
       docker-image: executorch-ubuntu-22.04-linter
@@ -56,7 +56,7 @@ jobs:
         exit $RC
 
   android-java-format:
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     with:
       runner: linux.2xlarge
       docker-image: executorch-ubuntu-22.04-linter

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -21,7 +21,7 @@ jobs:
     environment: ${{ (github.event_name == 'schedule') && 'update-commit-hash' || '' }}
     steps:
       - name: update-pytorch-commit-hash
-        uses: pytorch/test-infra/.github/actions/update-commit-hash@main
+        uses: pytorch/test-infra/.github/actions/update-commit-hash@release/2.6
         if: ${{ github.event_name == 'schedule' }}
         with:
           repo-name: pytorch

diff --git a/.github/workflows/periodic.yml b/.github/workflows/periodic.yml
@@ -39,7 +39,7 @@ jobs:
 
   test-models-linux:
     name: test-models-linux
-    uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
+    uses: pytorch/test-infra/.github/workflows/linux_job.yml@release/2.6
     needs: gather-models
     strategy:
       matrix: ${{ fromJSON(needs.gather-models.outputs.models) }}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		19eff28ff3f19b50da46f5a9ff5f4d4d213806fe
		release/2.6