diff --git a/.ci/pytorch/windows/arm64/bootstrap_libuv.bat b/.ci/pytorch/windows/arm64/bootstrap_libuv.bat index 33272f3ef09d..a05008239e09 100644 --- a/.ci/pytorch/windows/arm64/bootstrap_libuv.bat +++ b/.ci/pytorch/windows/arm64/bootstrap_libuv.bat @@ -7,7 +7,7 @@ if not exist "%DOWNLOADS_DIR%" mkdir %DOWNLOADS_DIR% if not exist "%DEPENDENCIES_DIR%" mkdir %DEPENDENCIES_DIR% :: activate visual studio -call "%DEPENDENCIES_DIR%\VSBuildTools\VC\Auxiliary\Build\vcvarsall.bat" arm64 +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" arm64 where cl.exe cd %DEPENDENCIES_DIR% diff --git a/.ci/pytorch/windows/arm64/bootstrap_openblas.bat b/.ci/pytorch/windows/arm64/bootstrap_openblas.bat index 463e765ede12..da9e0ddda09d 100644 --- a/.ci/pytorch/windows/arm64/bootstrap_openblas.bat +++ b/.ci/pytorch/windows/arm64/bootstrap_openblas.bat @@ -7,7 +7,7 @@ if not exist "%DOWNLOADS_DIR%" mkdir %DOWNLOADS_DIR% if not exist "%DEPENDENCIES_DIR%" mkdir %DEPENDENCIES_DIR% :: activate visual studio -call "%DEPENDENCIES_DIR%\VSBuildTools\VC\Auxiliary\Build\vcvarsall.bat" arm64 +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" arm64 where cl.exe :: Clone OpenBLAS diff --git a/.ci/pytorch/windows/arm64/bootstrap_tests.bat b/.ci/pytorch/windows/arm64/bootstrap_tests.bat index c0fc48702604..f3ad11c6f8ca 100644 --- a/.ci/pytorch/windows/arm64/bootstrap_tests.bat +++ b/.ci/pytorch/windows/arm64/bootstrap_tests.bat @@ -2,7 +2,7 @@ cd %PYTORCH_ROOT% :: activate visual studio -call "%DEPENDENCIES_DIR%\VSBuildTools\VC\Auxiliary\Build\vcvarsall.bat" arm64 +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" arm64 where cl.exe :: create virtual environment diff --git a/.ci/pytorch/windows/arm64/build_libtorch.bat b/.ci/pytorch/windows/arm64/build_libtorch.bat index 139e0b47be58..1ac14ff69773 100644 --- a/.ci/pytorch/windows/arm64/build_libtorch.bat +++ b/.ci/pytorch/windows/arm64/build_libtorch.bat @@ -21,7 +21,7 @@ if %ENABLE_APL% == 1 ( ) :: activate visual studio -call "%DEPENDENCIES_DIR%\VSBuildTools\VC\Auxiliary\Build\vcvarsall.bat" arm64 +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" arm64 where cl.exe :: change to source directory diff --git a/.ci/pytorch/windows/arm64/build_pytorch.bat b/.ci/pytorch/windows/arm64/build_pytorch.bat index b4d67b48e4fc..3363a2d08846 100644 --- a/.ci/pytorch/windows/arm64/build_pytorch.bat +++ b/.ci/pytorch/windows/arm64/build_pytorch.bat @@ -21,7 +21,7 @@ if %ENABLE_APL% == 1 ( ) :: activate visual studio -call "%DEPENDENCIES_DIR%\VSBuildTools\VC\Auxiliary\Build\vcvarsall.bat" arm64 +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" arm64 where cl.exe :: change to source directory diff --git a/.ci/pytorch/windows/arm64/smoke_test.bat b/.ci/pytorch/windows/arm64/smoke_test.bat index 378413cffc85..2c90f6158062 100644 --- a/.ci/pytorch/windows/arm64/smoke_test.bat +++ b/.ci/pytorch/windows/arm64/smoke_test.bat @@ -33,7 +33,7 @@ pushd tmp set VC_VERSION_LOWER=14 set VC_VERSION_UPPER=36 -call "%DEPENDENCIES_DIR%\VSBuildTools\VC\Auxiliary\Build\vcvarsall.bat" arm64 +call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" arm64 set install_root=%CD% set INCLUDE=%INCLUDE%;%install_root%\include;%install_root%\include\torch\csrc\api\include diff --git a/.github/actionlint.yaml b/.github/actionlint.yaml index 98dd884a6a98..a7fbd5715587 100644 --- a/.github/actionlint.yaml +++ b/.github/actionlint.yaml @@ -45,6 +45,7 @@ self-hosted-runner: - windows.g5.4xlarge.nvidia.gpu # Windows ARM64 runners - windows-11-arm64 + - windows-11-arm64-preview # Organization-wide AMD-hosted runners # MI2xx runners - linux.rocm.gpu diff --git a/.github/templates/windows_binary_build_workflow.yml.j2 b/.github/templates/windows_binary_build_workflow.yml.j2 index f2a607d98d01..c3a824ad05a3 100644 --- a/.github/templates/windows_binary_build_workflow.yml.j2 +++ b/.github/templates/windows_binary_build_workflow.yml.j2 @@ -76,7 +76,7 @@ jobs: if: ${{ github.repository_owner == 'pytorch' }} needs: get-label-type {%- if os == "windows-arm64" %} - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" {%- else %} {%- if branches == "nightly" %} runs-on: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge" @@ -102,23 +102,12 @@ jobs: run: | mkdir "%NIGHTLIES_PYTORCH_ROOT%" mkdir "%PYTORCH_FINAL_PACKAGE_DIR%" + - name: Enable long paths + shell: cmd + run: | + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - - name: Bootstrap Git - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" - - name: Git checkout PyTorch - recursive uses: actions/checkout@v4 with: path: "pytorch" @@ -172,7 +161,7 @@ jobs: - !{{ config["build_name"] }}-build - get-label-type {%- if os == "windows-arm64" %} - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" {%- else %} {%- if config["gpu_arch_type"] == "cuda" %} {%- if branches == "nightly" %} @@ -198,18 +187,11 @@ jobs: echo BINARY_ENV_FILE=%RUNNER_TEMP%/env>> %GITHUB_ENV% echo PYTORCH_FINAL_PACKAGE_DIR=%RUNNER_TEMP%/artifacts>> %GITHUB_ENV% echo WIN_PACKAGE_WORK_DIR=%RUNNER_TEMP%>> %GITHUB_ENV% - - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Populate binary env + - name: Enable long paths shell: cmd run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch uses: actions/checkout@v4 with: @@ -223,10 +205,6 @@ jobs: shell: cmd run: | "pytorch/.ci/pytorch/windows/arm64/bootstrap_python.bat" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - name: Bootstrap Rust shell: cmd run: | diff --git a/.github/workflows/generated-windows-arm64-binary-libtorch-debug-nightly.yml b/.github/workflows/generated-windows-arm64-binary-libtorch-debug-nightly.yml index c64cfd77790c..2c86e7e10359 100644 --- a/.github/workflows/generated-windows-arm64-binary-libtorch-debug-nightly.yml +++ b/.github/workflows/generated-windows-arm64-binary-libtorch-debug-nightly.yml @@ -50,7 +50,7 @@ jobs: libtorch-cpu-shared-with-deps-debug-build: if: ${{ github.repository_owner == 'pytorch' }} needs: get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -77,23 +77,12 @@ jobs: run: | mkdir "%NIGHTLIES_PYTORCH_ROOT%" mkdir "%PYTORCH_FINAL_PACKAGE_DIR%" + - name: Enable long paths + shell: cmd + run: | + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - - name: Bootstrap Git - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" - - name: Git checkout PyTorch - recursive uses: actions/checkout@v4 with: path: "pytorch" @@ -138,7 +127,7 @@ jobs: needs: - libtorch-cpu-shared-with-deps-debug-build - get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -160,18 +149,11 @@ jobs: echo BINARY_ENV_FILE=%RUNNER_TEMP%/env>> %GITHUB_ENV% echo PYTORCH_FINAL_PACKAGE_DIR=%RUNNER_TEMP%/artifacts>> %GITHUB_ENV% echo WIN_PACKAGE_WORK_DIR=%RUNNER_TEMP%>> %GITHUB_ENV% - - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Populate binary env + - name: Enable long paths shell: cmd run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch uses: actions/checkout@v4 with: @@ -185,10 +167,6 @@ jobs: shell: cmd run: | "pytorch/.ci/pytorch/windows/arm64/bootstrap_python.bat" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - name: Bootstrap Rust shell: cmd run: | diff --git a/.github/workflows/generated-windows-arm64-binary-libtorch-release-nightly.yml b/.github/workflows/generated-windows-arm64-binary-libtorch-release-nightly.yml index 373d990f01dd..912a452f0ee8 100644 --- a/.github/workflows/generated-windows-arm64-binary-libtorch-release-nightly.yml +++ b/.github/workflows/generated-windows-arm64-binary-libtorch-release-nightly.yml @@ -50,7 +50,7 @@ jobs: libtorch-cpu-shared-with-deps-release-build: if: ${{ github.repository_owner == 'pytorch' }} needs: get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -77,23 +77,12 @@ jobs: run: | mkdir "%NIGHTLIES_PYTORCH_ROOT%" mkdir "%PYTORCH_FINAL_PACKAGE_DIR%" + - name: Enable long paths + shell: cmd + run: | + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - - name: Bootstrap Git - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" - - name: Git checkout PyTorch - recursive uses: actions/checkout@v4 with: path: "pytorch" @@ -138,7 +127,7 @@ jobs: needs: - libtorch-cpu-shared-with-deps-release-build - get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -160,18 +149,11 @@ jobs: echo BINARY_ENV_FILE=%RUNNER_TEMP%/env>> %GITHUB_ENV% echo PYTORCH_FINAL_PACKAGE_DIR=%RUNNER_TEMP%/artifacts>> %GITHUB_ENV% echo WIN_PACKAGE_WORK_DIR=%RUNNER_TEMP%>> %GITHUB_ENV% - - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Populate binary env + - name: Enable long paths shell: cmd run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch uses: actions/checkout@v4 with: @@ -185,10 +167,6 @@ jobs: shell: cmd run: | "pytorch/.ci/pytorch/windows/arm64/bootstrap_python.bat" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - name: Bootstrap Rust shell: cmd run: | diff --git a/.github/workflows/generated-windows-arm64-binary-wheel-nightly.yml b/.github/workflows/generated-windows-arm64-binary-wheel-nightly.yml index b6dd618da915..1dd70d0d06a9 100644 --- a/.github/workflows/generated-windows-arm64-binary-wheel-nightly.yml +++ b/.github/workflows/generated-windows-arm64-binary-wheel-nightly.yml @@ -50,7 +50,7 @@ jobs: wheel-py3_11-cpu-build: if: ${{ github.repository_owner == 'pytorch' }} needs: get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -73,23 +73,12 @@ jobs: run: | mkdir "%NIGHTLIES_PYTORCH_ROOT%" mkdir "%PYTORCH_FINAL_PACKAGE_DIR%" + - name: Enable long paths + shell: cmd + run: | + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - - name: Bootstrap Git - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" - - name: Git checkout PyTorch - recursive uses: actions/checkout@v4 with: path: "pytorch" @@ -134,7 +123,7 @@ jobs: needs: - wheel-py3_11-cpu-build - get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -152,18 +141,11 @@ jobs: echo BINARY_ENV_FILE=%RUNNER_TEMP%/env>> %GITHUB_ENV% echo PYTORCH_FINAL_PACKAGE_DIR=%RUNNER_TEMP%/artifacts>> %GITHUB_ENV% echo WIN_PACKAGE_WORK_DIR=%RUNNER_TEMP%>> %GITHUB_ENV% - - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Populate binary env + - name: Enable long paths shell: cmd run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch uses: actions/checkout@v4 with: @@ -177,10 +159,6 @@ jobs: shell: cmd run: | "pytorch/.ci/pytorch/windows/arm64/bootstrap_python.bat" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - name: Bootstrap Rust shell: cmd run: | @@ -219,7 +197,7 @@ jobs: wheel-py3_12-cpu-build: if: ${{ github.repository_owner == 'pytorch' }} needs: get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -242,23 +220,12 @@ jobs: run: | mkdir "%NIGHTLIES_PYTORCH_ROOT%" mkdir "%PYTORCH_FINAL_PACKAGE_DIR%" + - name: Enable long paths + shell: cmd + run: | + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - - name: Bootstrap Git - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" - - name: Git checkout PyTorch - recursive uses: actions/checkout@v4 with: path: "pytorch" @@ -303,7 +270,7 @@ jobs: needs: - wheel-py3_12-cpu-build - get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -321,18 +288,11 @@ jobs: echo BINARY_ENV_FILE=%RUNNER_TEMP%/env>> %GITHUB_ENV% echo PYTORCH_FINAL_PACKAGE_DIR=%RUNNER_TEMP%/artifacts>> %GITHUB_ENV% echo WIN_PACKAGE_WORK_DIR=%RUNNER_TEMP%>> %GITHUB_ENV% - - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Populate binary env + - name: Enable long paths shell: cmd run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch uses: actions/checkout@v4 with: @@ -346,10 +306,6 @@ jobs: shell: cmd run: | "pytorch/.ci/pytorch/windows/arm64/bootstrap_python.bat" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - name: Bootstrap Rust shell: cmd run: | @@ -388,7 +344,7 @@ jobs: wheel-py3_13-cpu-build: if: ${{ github.repository_owner == 'pytorch' }} needs: get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -411,23 +367,12 @@ jobs: run: | mkdir "%NIGHTLIES_PYTORCH_ROOT%" mkdir "%PYTORCH_FINAL_PACKAGE_DIR%" + - name: Enable long paths + shell: cmd + run: | + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - - name: Bootstrap Git - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" - - name: Git checkout PyTorch - recursive uses: actions/checkout@v4 with: path: "pytorch" @@ -472,7 +417,7 @@ jobs: needs: - wheel-py3_13-cpu-build - get-label-type - runs-on: "windows-11-arm64" + runs-on: "windows-11-arm64-preview" timeout-minutes: 300 env: PYTORCH_ROOT: ${{ github.workspace }}/pytorch @@ -490,18 +435,11 @@ jobs: echo BINARY_ENV_FILE=%RUNNER_TEMP%/env>> %GITHUB_ENV% echo PYTORCH_FINAL_PACKAGE_DIR=%RUNNER_TEMP%/artifacts>> %GITHUB_ENV% echo WIN_PACKAGE_WORK_DIR=%RUNNER_TEMP%>> %GITHUB_ENV% - - name: Git checkout PyTorch - uses: actions/checkout@v4 - with: - path: "pytorch" - - name: Populate binary env + - name: Enable long paths shell: cmd run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_git.bat" - - name: Remove Pytorch folder - shell: cmd - run: | - rmdir /s /q "pytorch" + git config --system --get core.longpaths || echo "core.longpaths is not set, setting it now" + git config --system core.longpaths true - name: Git checkout PyTorch uses: actions/checkout@v4 with: @@ -515,10 +453,6 @@ jobs: shell: cmd run: | "pytorch/.ci/pytorch/windows/arm64/bootstrap_python.bat" - - name: Bootstrap Build Tools - shell: cmd - run: | - "pytorch/.ci/pytorch/windows/arm64/bootstrap_buildtools.bat" - name: Bootstrap Rust shell: cmd run: |