Skip to content

Commit 914f393

Browse files
committed
Reapply "Cleanup VS 2019 refs in pytorch (pytorch#145863)" (pytorch#152613)
This reverts commit e4f2282.
1 parent d4d0ede commit 914f393

File tree

4 files changed

+0
-61
lines changed

4 files changed

+0
-61
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ goto end
9999
:libtorch
100100
echo "install and test libtorch"
101101

102-
if "%VC_YEAR%" == "2019" powershell internal\vs2019_install.ps1
103102
if "%VC_YEAR%" == "2022" powershell internal\vs2022_install.ps1
104103

105104
if ERRORLEVEL 1 exit /b 1
@@ -111,10 +110,6 @@ pushd tmp\libtorch
111110

112111
set VC_VERSION_LOWER=17
113112
set VC_VERSION_UPPER=18
114-
IF "%VC_YEAR%" == "2019" (
115-
set VC_VERSION_LOWER=16
116-
set VC_VERSION_UPPER=17
117-
)
118113

119114
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 (
120115
if exist "%%i" if exist "%%i\VC\Auxiliary\Build\vcvarsall.bat" (

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
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-
:: Please don't delete VS2019 as an alternative, in case some Windows compiler issue.
7-
:: Reference: https://github.com/pytorch/pytorch/issues/145702#issuecomment-2858693930
8-
if "%VC_YEAR%" == "2019" (
9-
set VC_VERSION_LOWER=16
10-
set VC_VERSION_UPPER=17
11-
)
125

136
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 (
147
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
@@ -13,7 +13,6 @@ if [[ "$OS" != "windows-arm64" ]]; then
1313
fi
1414

1515
if [[ "$DESIRED_CUDA" == 'xpu' ]]; then
16-
export VC_YEAR=2022
1716
export USE_SCCACHE=0
1817
export XPU_VERSION=2025.1
1918
export XPU_ENABLE_KINETO=1

0 commit comments

Comments
 (0)