diff options
| author | Rui Guo <guorui.xt@gmail.com> | 2017-04-02 16:44:02 +0300 |
|---|---|---|
| committer | Rui Guo <guorui.xt@gmail.com> | 2017-04-02 16:44:02 +0300 |
| commit | 2f95bf3ac5c6653b12ce7e5db1c8c0564c501b99 (patch) | |
| tree | 8429667a63f96355efa260e131b4a82c1b696c44 | |
| parent | 4f6249eb2874be15fe57296787263700716993d4 (diff) | |
add vs2017 support
| -rw-r--r-- | install-deps.bat | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/install-deps.bat b/install-deps.bat index e80960a..5fc2185 100644 --- a/install-deps.bat +++ b/install-deps.bat @@ -46,6 +46,7 @@ set TORCH_SETUP_FAIL=1 :::: validate msvc version :::: if "%VisualStudioVersion%" == "" ( + if not "%VS150COMNTOOLS%" == "" ( call "%VS150COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat" x64 && goto :VS_SETUP) if not "%VS140COMNTOOLS%" == "" ( call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" x64 && goto :VS_SETUP) if not "%VS120COMNTOOLS%" == "" ( call "%VS120COMNTOOLS%..\..\VC\vcvarsall.bat" x64 && goto :VS_SETUP) if not "%VS110COMNTOOLS%" == "" ( call "%VS110COMNTOOLS%..\..\VC\vcvarsall.bat" x64 && goto :VS_SETUP) @@ -65,14 +66,17 @@ if "%PreferredToolArchitecture%" == "x64" ( if "%CommandPromptType%" == "Cross" ( if "%Platform%" == "ARM" set TORCH_VS_PLATFORM=amd64_arm if "%Platform%" == "X86" set TORCH_VS_PLATFORM=amd64_x86 + if "%Platform%" == "x86" set TORCH_VS_PLATFORM=amd64_x86 ) ) else ( if "%CommandPromptType%" == "Cross" ( if "%Platform%" == "ARM" set TORCH_VS_PLATFORM=x86_arm + if "%Platform%" == "X64" set TORCH_VS_PLATFORM=x86_amd64 if "%Platform%" == "x64" set TORCH_VS_PLATFORM=x86_amd64 ) if "%CommandPromptType%" == "Native" ( if "%Platform%" == "X64" set TORCH_VS_PLATFORM=x64 + if "%Platform%" == "x64" set TORCH_VS_PLATFORM=x64 ) if "%Platform%" == "" set TORCH_VS_PLATFORM=x86 ) @@ -360,7 +364,12 @@ echo set TORCH_INSTALL_DIR=%%~dp0.>> %TORCHACTIVATE_CMD% echo set TORCH_CONDA_ENV=%TORCH_CONDA_ENV%>> %TORCHACTIVATE_CMD% echo set TORCH_VS_VERSION=%TORCH_VS_VERSION%>> %TORCHACTIVATE_CMD% echo set TORCH_VS_PLATFORM=%TORCH_VS_PLATFORM%>> %TORCHACTIVATE_CMD% -echo for /f "delims=" %%%%i in ('call echo %%%%VS%TORCH_VS_VERSION%0COMNTOOLS%%%%') do call "%%%%i..\..\VC\vcvarsall.bat" %TORCH_VS_PLATFORM%>> %TORCHACTIVATE_CMD% +if "%TORCH_VS_VERSION%" == "15" ( + set VCVARSALL_BAT_PATH=..\..\VC\Auxiliary\Build\vcvarsall.bat +) else ( + set VCVARSALL_BAT_PATH=..\..\VC\vcvarsall.bat +) +echo for /f "delims=" %%%%i in ('call echo %%%%VS%TORCH_VS_VERSION%0COMNTOOLS%%%%') do call "%%%%i%VCVARSALL_BAT_PATH%" %TORCH_VS_PLATFORM%>> %TORCHACTIVATE_CMD% echo set PATH=%NEW_PATH%>> %TORCHACTIVATE_CMD% echo set LUA_PATH=%NEW_LUA_PATH%>> %TORCHACTIVATE_CMD% echo set LUA_CPATH=%NEW_LUA_CPATH%>> %TORCHACTIVATE_CMD% |