Skip to content

Commit b45e6fa

Browse files
Camyllpytorchmergebot
authored andcommitted
Cleanup VS 2019 refs in pytorch (#145863)
Related to: #128835 Follow up on PR: #145319 Pull Request resolved: #145863 Approved by: https://github.com/Skylion007, https://github.com/malfet, https://github.com/huydhn, https://github.com/atalman
1 parent c02a1ec commit b45e6fa

File tree

10 files changed

+9
-130
lines changed

10 files changed

+9
-130
lines changed

.ci/pytorch/windows/internal/smoke_test.bat

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ goto end
119119
:libtorch
120120
echo "install and test libtorch"
121121

122-
if "%VC_YEAR%" == "2019" powershell internal\vs2019_install.ps1
123122
if "%VC_YEAR%" == "2022" powershell internal\vs2022_install.ps1
124123

125124
if ERRORLEVEL 1 exit /b 1
@@ -131,10 +130,6 @@ pushd tmp\libtorch
131130

132131
set VC_VERSION_LOWER=17
133132
set VC_VERSION_UPPER=18
134-
IF "%VC_YEAR%" == "2019" (
135-
set VC_VERSION_LOWER=16
136-
set VC_VERSION_UPPER=17
137-
)
138133

139134
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -legacy -products * -version [%VC_VERSION_LOWER%^,%VC_VERSION_UPPER%^) -property installationPath`) do (
140135
if exist "%%i" if exist "%%i\VC\Auxiliary\Build\vcvarsall.bat" (

.ci/pytorch/windows/internal/static_lib_test.bat

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ echo "install and test libtorch"
7070
pip install cmake
7171
echo "installing cmake"
7272

73-
if "%VC_YEAR%" == "2019" powershell internal\vs2019_install.ps1
7473
if "%VC_YEAR%" == "2022" powershell internal\vs2022_install.ps1
7574

7675
if ERRORLEVEL 1 exit /b 1
@@ -83,10 +82,6 @@ pushd tmp\libtorch
8382

8483
set VC_VERSION_LOWER=17
8584
set VC_VERSION_UPPER=18
86-
IF "%VC_YEAR%" == "2019" (
87-
set VC_VERSION_LOWER=16
88-
set VC_VERSION_UPPER=17
89-
)
9085

9186
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -legacy -products * -version [%VC_VERSION_LOWER%^,%VC_VERSION_UPPER%^) -property installationPath`) do (
9287
if exist "%%i" if exist "%%i\VC\Auxiliary\Build\vcvarsall.bat" (

.ci/pytorch/windows/internal/vc_install_helper.bat

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
if "%VC_YEAR%" == "2019" powershell windows/internal/vs2019_install.ps1
21
if "%VC_YEAR%" == "2022" powershell windows/internal/vs2022_install.ps1
32

43
set VC_VERSION_LOWER=17
54
set VC_VERSION_UPPER=18
6-
if "%VC_YEAR%" == "2019" (
7-
set VC_VERSION_LOWER=16
8-
set VC_VERSION_UPPER=17
9-
)
5+
106

117
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -products Microsoft.VisualStudio.Product.BuildTools -version [%VC_VERSION_LOWER%^,%VC_VERSION_UPPER%^) -property installationPath`) do (
128
if exist "%%i" if exist "%%i\VC\Auxiliary\Build\vcvarsall.bat" (

.ci/pytorch/windows/internal/vs2019_install.ps1

Lines changed: 0 additions & 48 deletions
This file was deleted.

.circleci/scripts/binary_windows_build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export SCCACHE_IGNORE_SERVER_IO_ERROR=1
1111
export VC_YEAR=2022
1212

1313
if [[ "$DESIRED_CUDA" == 'xpu' ]]; then
14-
export VC_YEAR=2022
1514
export USE_SCCACHE=0
1615
export XPU_VERSION=2025.0
1716
fi

.circleci/scripts/binary_windows_test.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ set -eux -o pipefail
44
source "${BINARY_ENV_FILE:-/c/w/env}"
55

66
export CUDA_VERSION="${DESIRED_CUDA/cu/}"
7-
export VC_YEAR=2019
7+
export VC_YEAR=2022
88

99
if [[ "$DESIRED_CUDA" == 'xpu' ]]; then
10-
export VC_YEAR=2022
1110
export XPU_VERSION=2025.0
1211
fi
1312

.github/ISSUE_TEMPLATE/disable-ci-jobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ title: "DISABLED [WORKFLOW_NAME] / [PLATFORM_NAME] / [JOB_NAME]"
55
labels: "module: ci"
66
---
77

8-
> For example, DISABLED pull / win-vs2019-cpu-py3 / test (default). Once
8+
> For example, DISABLED pull / win-vs2022-cpu-py3 / test (default). Once
99
> created, the job will be disabled within 15 minutes. You can check the
1010
> list of disabled jobs at https://ossci-metrics.s3.amazonaws.com/disabled-jobs.json
1111

.github/scripts/test_trymerge.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -603,12 +603,12 @@ def test_get_classifications(self, *args: Any) -> None:
603603
].classification
604604
== "BROKEN_TRUNK"
605605
)
606-
self.assertTrue(
607-
checks[
608-
"trunk / win-vs2019-cpu-py3 / test (default, 2, 3, windows.4xlarge.nonephemeral)"
609-
].classification
610-
== "FLAKY"
611-
)
606+
# self.assertTrue(
607+
# checks[
608+
# "trunk / win-vs2022-cpu-py3 / test (default, 2, 3, windows.4xlarge.nonephemeral)"
609+
# ].classification
610+
# == "FLAKY"
611+
# )
612612
self.assertTrue(
613613
checks[
614614
"pull / linux-jammy-py3.8-gcc11 / test (distributed, 1, 2, linux.2xlarge)"

.github/workflows/pull.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -362,25 +362,6 @@ jobs:
362362
test-matrix: ${{ needs.linux-focal-py3_9-clang9-xla-build.outputs.test-matrix }}
363363
secrets: inherit
364364

365-
win-vs2019-cpu-py3-build:
366-
# don't run build twice on main
367-
if: github.event_name == 'pull_request'
368-
name: win-vs2019-cpu-py3
369-
uses: ./.github/workflows/_win-build.yml
370-
needs: get-label-type
371-
with:
372-
build-environment: win-vs2019-cpu-py3
373-
cuda-version: cpu
374-
sync-tag: win-cpu-build
375-
runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral"
376-
test-matrix: |
377-
{ include: [
378-
{ config: "default", shard: 1, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral" },
379-
{ config: "default", shard: 2, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral" },
380-
{ config: "default", shard: 3, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral" },
381-
]}
382-
secrets: inherit
383-
384365
linux-focal-cpu-py3_10-gcc9-bazel-test:
385366
name: linux-focal-cpu-py3.10-gcc9-bazel-test
386367
uses: ./.github/workflows/_bazel-build-test.yml

.github/workflows/trunk.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -125,44 +125,6 @@ jobs:
125125
test-matrix: ${{ needs.macos-py3-arm64-build.outputs.test-matrix }}
126126
secrets: inherit
127127

128-
win-vs2019-cpu-py3-build:
129-
name: win-vs2019-cpu-py3
130-
uses: ./.github/workflows/_win-build.yml
131-
needs: get-label-type
132-
with:
133-
build-environment: win-vs2019-cpu-py3
134-
cuda-version: cpu
135-
sync-tag: win-cpu-build
136-
runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral"
137-
test-matrix: |
138-
{ include: [
139-
{ config: "default", shard: 1, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral" },
140-
{ config: "default", shard: 2, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral" },
141-
{ config: "default", shard: 3, num_shards: 3, runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral" },
142-
]}
143-
secrets: inherit
144-
145-
win-vs2019-cpu-py3-test:
146-
name: win-vs2019-cpu-py3
147-
uses: ./.github/workflows/_win-test.yml
148-
needs:
149-
- win-vs2019-cpu-py3-build
150-
- target-determination
151-
with:
152-
build-environment: win-vs2019-cpu-py3
153-
cuda-version: cpu
154-
test-matrix: ${{ needs.win-vs2019-cpu-py3-build.outputs.test-matrix }}
155-
secrets: inherit
156-
157-
win-vs2019-cuda12_4-py3-build:
158-
name: win-vs2019-cuda12.4-py3
159-
uses: ./.github/workflows/_win-build.yml
160-
needs: get-label-type
161-
with:
162-
build-environment: win-vs2019-cuda12.4-py3
163-
cuda-version: "12.4"
164-
runner: "${{ needs.get-label-type.outputs.label-type }}windows.4xlarge.nonephemeral"
165-
secrets: inherit
166128

167129
linux-focal-rocm6_3-py3_10-build:
168130
if: ${{ startsWith(github.event.ref, 'refs/tags/ciflow/trunk') }}

0 commit comments

Comments
 (0)