File tree Expand file tree Collapse file tree 6 files changed +6
-55
lines changed Expand file tree Collapse file tree 6 files changed +6
-55
lines changed Original file line number Diff line number Diff line change @@ -16,18 +16,14 @@ IF "%BUILD_VISION%" == "" (
16
16
)
17
17
)
18
18
19
- IF NOT EXIST " %ProgramFiles(x86)% \Microsoft Visual Studio\Installer\vswhere.exe" (
19
+ if not exist " %ProgramFiles(x86)% \Microsoft Visual Studio\Installer\vswhere.exe" (
20
20
echo Visual Studio %VC_YEAR% C++ BuildTools is required to compile PyTorch on Windows
21
21
exit /b 1
22
22
)
23
23
24
24
set VC_VERSION_LOWER = 17
25
25
set VC_VERSION_UPPER = 18
26
- IF " %VC_YEAR% " == " 2017" (
27
- set VC_VERSION_LOWER = 15
28
- set VC_VERSION_UPPER = 16
29
- )
30
- IF " %VC_YEAR% " == " 2019" (
26
+ if " %VC_YEAR% " == " 2019" (
31
27
set VC_VERSION_LOWER = 16
32
28
set VC_VERSION_UPPER = 17
33
29
)
Original file line number Diff line number Diff line change @@ -137,9 +137,6 @@ if not exist "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v%CUDA_VERSION_
137
137
popd
138
138
139
139
echo Installing VS integration...
140
- if " %VC_YEAR% " == " 2017" (
141
- xcopy /Y " %SRC_DIR% \temp_build\cuda\CUDAVisualStudioIntegration\extras\visual_studio_integration\MSBuildExtensions\*.*" " C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\Common7\IDE\VC\VCTargets\BuildCustomizations"
142
- )
143
140
if " %VC_YEAR% " == " 2019" (
144
141
xcopy /Y " %SRC_DIR% \temp_build\cuda\CUDAVisualStudioIntegration\extras\visual_studio_integration\MSBuildExtensions\*.*" " C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Microsoft\VC\v160\BuildCustomizations"
145
142
)
Original file line number Diff line number Diff line change 5
5
6
6
setlocal
7
7
8
- IF NOT EXIST " %ProgramFiles(x86)% \Microsoft Visual Studio\Installer\vswhere.exe" (
8
+ if not exist " %ProgramFiles(x86)% \Microsoft Visual Studio\Installer\vswhere.exe" (
9
9
echo Visual Studio %VC_YEAR% C++ BuildTools is required to compile PyTorch on Windows
10
10
exit /b 1
11
11
)
12
12
13
13
set VC_VERSION_LOWER = 17
14
14
set VC_VERSION_UPPER = 18
15
- IF " %VC_YEAR% " == " 2017" (
16
- set VC_VERSION_LOWER = 15
17
- set VC_VERSION_UPPER = 16
18
- )
19
- IF " %VC_YEAR% " == " 2019" (
15
+ if " %VC_YEAR% " == " 2019" (
20
16
set VC_VERSION_LOWER = 16
21
17
set VC_VERSION_UPPER = 17
22
18
)
@@ -31,7 +27,7 @@ for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio
31
27
32
28
:vswhere
33
29
34
- IF " %VS15VCVARSALL% " == " " (
30
+ if " %VS15VCVARSALL% " == " " (
35
31
echo Visual Studio %VC_YEAR% C++ BuildTools is required to compile PyTorch on Windows
36
32
exit /b 1
37
33
)
Original file line number Diff line number Diff line change @@ -147,7 +147,6 @@ goto end
147
147
:libtorch
148
148
echo " install and test libtorch"
149
149
150
- if " %VC_YEAR% " == " 2017" powershell internal\vs2017_install.ps1
151
150
if " %VC_YEAR% " == " 2019" powershell internal\vs2019_install.ps1
152
151
if " %VC_YEAR% " == " 2022" powershell internal\vs2022_install.ps1
153
152
@@ -160,10 +159,6 @@ pushd tmp\libtorch
160
159
161
160
set VC_VERSION_LOWER = 17
162
161
set VC_VERSION_UPPER = 18
163
- IF " %VC_YEAR% " == " 2017" (
164
- set VC_VERSION_LOWER = 15
165
- set VC_VERSION_UPPER = 16
166
- )
167
162
IF " %VC_YEAR% " == " 2019" (
168
163
set VC_VERSION_LOWER = 16
169
164
set VC_VERSION_UPPER = 17
Original file line number Diff line number Diff line change 1
- if " %VC_YEAR% " == " 2017" powershell windows/internal/vs2017_install.ps1
2
1
if " %VC_YEAR% " == " 2019" powershell windows/internal/vs2019_install.ps1
3
2
if " %VC_YEAR% " == " 2022" powershell windows/internal/vs2022_install.ps1
4
3
5
4
set VC_VERSION_LOWER = 17
6
5
set VC_VERSION_UPPER = 18
7
- IF " %VC_YEAR% " == " 2017" (
8
- set VC_VERSION_LOWER = 15
9
- set VC_VERSION_UPPER = 16
10
- )
11
- IF " %VC_YEAR% " == " 2019" (
6
+ if " %VC_YEAR% " == " 2019" (
12
7
set VC_VERSION_LOWER = 16
13
8
set VC_VERSION_UPPER = 17
14
9
)
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments