Skip to content

Commit

Permalink
torch-lua -> luajit
Browse files Browse the repository at this point in the history
  • Loading branch information
@soumith
soumith committed Oct 30, 2014
1 parent fd5f249 commit 02371d5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cmake/TorchDOK.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ MACRO(ADD_TORCH_DOK srcdir dstdir section title rank)

ENDMACRO(ADD_TORCH_DOK)

INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/torch-lua -ltorch -ldok -e \"dok.installsearch()\")")
INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_INSTALL_PREFIX}/bin/luajit -ltorch -ldok -e \"dok.installsearch()\")")
2 changes: 1 addition & 1 deletion cmake/TorchWrap.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ MACRO(ADD_TORCH_WRAP target luafile)
SET(cfile "${_file_}.c")
ADD_CUSTOM_COMMAND(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${cfile}"
COMMAND torch-lua ARGS "-e \"dofile('${Torch_SOURCE_PKG}/wrap/init.lua')\" " "${CMAKE_CURRENT_SOURCE_DIR}/${luafile}" "${CMAKE_CURRENT_BINARY_DIR}/${cfile}"
COMMAND luajit ARGS "-ltorch -e \"dofile('${Torch_SOURCE_PKG}/wrap/init.lua')\" " "${CMAKE_CURRENT_SOURCE_DIR}/${luafile}" "${CMAKE_CURRENT_BINARY_DIR}/${cfile}"
DEPENDS "${luafile}" ${Torch_SOURCE_LUA} "${Torch_SOURCE_PKG}/wrap/init.lua" "${Torch_SOURCE_PKG}/wrap/types.lua")
ADD_CUSTOM_TARGET(${target} DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${cfile}")
ENDMACRO(ADD_TORCH_WRAP)

0 comments on commit 02371d5

Please sign in to comment.