diff options
| author | Soumith Chintala <soumith@gmail.com> | 2017-01-27 17:54:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 17:54:26 +0300 |
| commit | d78ef0b2ea027d1ea47e93e772f0982e0b3ad7c3 (patch) | |
| tree | 3992e56257dfe67665db18fe2bd30ffa1483d557 | |
| parent | 41f10b0641a88cfbf2d6d6bc460a104a3e69e003 (diff) | |
| parent | c1ea3035a7668b093b8f247c32795288ff84767e (diff) | |
Merge pull request #196 from BTNC/master
updating packages for msvc
| -rw-r--r-- | install-deps.bat | 4 | ||||
| -rw-r--r-- | install.bat | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/install-deps.bat b/install-deps.bat index 4653f58..759a497 100644 --- a/install-deps.bat +++ b/install-deps.bat @@ -370,6 +370,7 @@ if not "%LUAJIT_CMD%" == "" ( if exist "%LUAJIT_CMD%" del %LUAJIT_CMD% echo @echo off>> "%LUAJIT_CMD%" echo setlocal>> "%LUAJIT_CMD%" + echo set TORCH_INSTALL_DIR=%%~dp0.>> "%LUAJIT_CMD%" echo call %%TORCH_INSTALL_DIR%%\torch-activate.cmd>> "%LUAJIT_CMD%" echo %%TORCH_INSTALL_DIR%%\bin\luajit.exe %%*>> "%LUAJIT_CMD%" echo endlocal>> "%LUAJIT_CMD%" @@ -379,6 +380,7 @@ if not "%LUA_CMD%" == "" ( if exist "%LUA_CMD%" del %LUA_CMD% echo @echo off>> "%LUA_CMD%" echo setlocal>> "%LUA_CMD%" + echo set TORCH_INSTALL_DIR=%%~dp0.>> "%LUA_CMD%" echo call %%TORCH_INSTALL_DIR%%\torch-activate.cmd>> "%LUA_CMD%" echo %%TORCH_INSTALL_DIR%%\bin\lua.exe %%*>> "%LUA_CMD%" echo endlocal>> "%LUA_CMD%" @@ -388,6 +390,7 @@ if not "%LUAC_CMD%" == "" ( if exist "%LUAC_CMD%" del %LUAC_CMD% echo @echo off>> "%LUAC_CMD%" echo setlocal>> "%LUAC_CMD%" + echo set TORCH_INSTALL_DIR=%%~dp0.>> "%LUAC_CMD%" echo call %%TORCH_INSTALL_DIR%%\torch-activate.cmd>> "%LUAC_CMD%" echo %%TORCH_INSTALL_DIR%%\bin\luac.exe %%*>> "%LUAC_CMD%" echo endlocal>> "%LUAC_CMD%" @@ -396,6 +399,7 @@ if not "%LUAC_CMD%" == "" ( if exist %LUAROCKS_CMD% del %LUAROCKS_CMD% echo @echo off>> %LUAROCKS_CMD% echo setlocal>> %LUAROCKS_CMD% +echo set TORCH_INSTALL_DIR=%%~dp0.>> %LUAROCKS_CMD% echo call %%TORCH_INSTALL_DIR%%\torch-activate.cmd>> %LUAROCKS_CMD% echo call %%TORCH_INSTALL_DIR%%\luarocks\luarocks.bat %%*>> %LUAROCKS_CMD% echo endlocal>> %LUAROCKS_CMD% diff --git a/install.bat b/install.bat index 0cc42a5..dc967c6 100644 --- a/install.bat +++ b/install.bat @@ -11,9 +11,6 @@ if not "%TORCH_SETUP_FAIL%" == "0" goto :FAIL echo %ECHO_PREFIX% Updating submodules git submodule update --init --recursive -cd %TORCH_DISTRO%\pkg\torch && git checkout master && git pull && git checkout f624ae98624d4e356eebee00ddcd3e721c90f7ba -cd %TORCH_DISTRO%\extra\cunn && git checkout master && git pull && git checkout 349df42dfa550389f04ac90ea621f21b2838b00c -cd %TORCH_DISTRO%\extra\cudnn && git checkout master && git pull && git checkout 99bc14eac2e3653adb87348e28d39ec1f40012b0 set PATCH_DIR=%TORCH_DISTRO%\win-files\patch |