diff options
| author | Ronan Collobert <locronan@fb.com> | 2017-01-11 02:31:40 +0300 |
|---|---|---|
| committer | Ronan Collobert <locronan@fb.com> | 2017-01-11 02:31:40 +0300 |
| commit | eabbc20e9349e8ab6074e8a07c08e51dcf63bb89 (patch) | |
| tree | 498dc522a52de123e2da43df526b0f8acff2dd69 | |
| parent | afed56595cd26ff62f054c0f6381c6eb593c3afa (diff) | |
provide install paths through require 'torch.paths'installpaths
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | paths.lua.in | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 611258b..095a721 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,6 +64,8 @@ INCLUDE(TorchExports) # Torch libraries ADD_SUBDIRECTORY(lib) +CONFIGURE_FILE(paths.lua.in "${CMAKE_CURRENT_BINARY_DIR}/paths.lua") + INCLUDE_DIRECTORIES(BEFORE "${LUA_INCDIR}") INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/lib/TH") INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_BINARY_DIR}/lib/TH") @@ -71,7 +73,7 @@ INCLUDE_DIRECTORIES(BEFORE "${CMAKE_CURRENT_SOURCE_DIR}/lib/luaT") LINK_DIRECTORIES("${LUA_LIBDIR}") SET(src DiskFile.c File.c MemoryFile.c PipeFile.c Storage.c Tensor.c Timer.c utils.c init.c TensorOperator.c TensorMath.c random.c Generator.c) -SET(luasrc init.lua File.lua Tensor.lua CmdLine.lua FFI.lua Tester.lua TestSuite.lua test/test.lua) +SET(luasrc init.lua File.lua Tensor.lua CmdLine.lua FFI.lua Tester.lua TestSuite.lua ${CMAKE_CURRENT_BINARY_DIR}/paths.lua test/test.lua) # Necessary do generate wrapper ADD_TORCH_WRAP(tensormathwrap TensorMath.lua) diff --git a/paths.lua.in b/paths.lua.in new file mode 100644 index 0000000..287770b --- /dev/null +++ b/paths.lua.in @@ -0,0 +1,11 @@ +local paths = {} + +paths.install_prefix = [[@Torch_INSTALL_PREFIX@]] +paths.install_bin = [[@Torch_INSTALL_BIN@]] +paths.install_man = [[@Torch_INSTALL_MAN@]] +paths.install_lib = [[@Torch_INSTALL_LIB@]] +paths.install_share = [[@Torch_INSTALL_SHARE@]] +paths.install_include = [[@Torch_INSTALL_INCLUDE@]] +paths.install_cmake = [[@Torch_INSTALL_CMAKE@]] + +return paths |