From: Vsevolod Stakhov Date: Wed, 23 May 2018 17:14:15 +0000 (+0100) Subject: [Minor] Move lua contrib libraries to lua- prefix X-Git-Tag: 1.7.6~109 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=714eb56e1760fdfb26afccde92664d3a2f1e8435;p=thirdparty%2Frspamd.git [Minor] Move lua contrib libraries to lua- prefix --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a9373faaf..80a804e2e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,7 +502,7 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/" "${CMAKE_SOURCE_DIR}/contrib/librdns" "${CMAKE_SOURCE_DIR}/contrib/aho-corasick" "${CMAKE_SOURCE_DIR}/contrib/lc-btrie" - "${CMAKE_SOURCE_DIR}/contrib/lpeg" + "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg" "${CMAKE_BINARY_DIR}/src" #Stored in the binary dir "${CMAKE_BINARY_DIR}/src/libcryptobox") @@ -1240,7 +1240,7 @@ ENDIF() ADD_SUBDIRECTORY(contrib/libucl) ADD_SUBDIRECTORY(contrib/librdns) ADD_SUBDIRECTORY(contrib/aho-corasick) -ADD_SUBDIRECTORY(contrib/lpeg) +ADD_SUBDIRECTORY(contrib/lua-lpeg) ADD_SUBDIRECTORY(contrib/linenoise) ADD_SUBDIRECTORY(contrib/t1ha) @@ -1261,11 +1261,11 @@ ENDIF() IF(ENABLE_TORCH MATCHES "ON") IF(WITH_LUAJIT) - ADD_SUBDIRECTORY(contrib/torch/paths) - ADD_SUBDIRECTORY(contrib/torch/torch7) - ADD_SUBDIRECTORY(contrib/torch/nn) - ADD_SUBDIRECTORY(contrib/torch/optim) - ADD_SUBDIRECTORY(contrib/torch/decisiontree) + ADD_SUBDIRECTORY(contrib/lua-torch/paths) + ADD_SUBDIRECTORY(contrib/lua-torch/torch7) + ADD_SUBDIRECTORY(contrib/lua-torch/nn) + ADD_SUBDIRECTORY(contrib/lua-torch/optim) + ADD_SUBDIRECTORY(contrib/lua-torch/decisiontree) SET(WITH_TORCH 1) ELSE() MESSAGE(FATAL_ERROR "Cannot enable torch without luajit") @@ -1361,7 +1361,7 @@ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR}) INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR}) IF(ENABLE_TORCH MATCHES "ON") - INSTALL(FILES "contrib/moses/moses.lua" DESTINATION ${LUALIBDIR}) + INSTALL(FILES "contrib/lua-moses/moses.lua" DESTINATION ${LUALIBDIR}) ENDIF() # systemd unit diff --git a/contrib/lpeg/CMakeLists.txt b/contrib/lua-lpeg/CMakeLists.txt similarity index 100% rename from contrib/lpeg/CMakeLists.txt rename to contrib/lua-lpeg/CMakeLists.txt diff --git a/contrib/lpeg/LICENSE b/contrib/lua-lpeg/LICENSE similarity index 100% rename from contrib/lpeg/LICENSE rename to contrib/lua-lpeg/LICENSE diff --git a/contrib/lpeg/lpcap.c b/contrib/lua-lpeg/lpcap.c similarity index 100% rename from contrib/lpeg/lpcap.c rename to contrib/lua-lpeg/lpcap.c diff --git a/contrib/lpeg/lpcap.h b/contrib/lua-lpeg/lpcap.h similarity index 100% rename from contrib/lpeg/lpcap.h rename to contrib/lua-lpeg/lpcap.h diff --git a/contrib/lpeg/lpcode.c b/contrib/lua-lpeg/lpcode.c similarity index 100% rename from contrib/lpeg/lpcode.c rename to contrib/lua-lpeg/lpcode.c diff --git a/contrib/lpeg/lpcode.h b/contrib/lua-lpeg/lpcode.h similarity index 100% rename from contrib/lpeg/lpcode.h rename to contrib/lua-lpeg/lpcode.h diff --git a/contrib/lpeg/lpprint.c b/contrib/lua-lpeg/lpprint.c similarity index 100% rename from contrib/lpeg/lpprint.c rename to contrib/lua-lpeg/lpprint.c diff --git a/contrib/lpeg/lpprint.h b/contrib/lua-lpeg/lpprint.h similarity index 100% rename from contrib/lpeg/lpprint.h rename to contrib/lua-lpeg/lpprint.h diff --git a/contrib/lpeg/lptree.c b/contrib/lua-lpeg/lptree.c similarity index 100% rename from contrib/lpeg/lptree.c rename to contrib/lua-lpeg/lptree.c diff --git a/contrib/lpeg/lptree.h b/contrib/lua-lpeg/lptree.h similarity index 100% rename from contrib/lpeg/lptree.h rename to contrib/lua-lpeg/lptree.h diff --git a/contrib/lpeg/lptypes.h b/contrib/lua-lpeg/lptypes.h similarity index 100% rename from contrib/lpeg/lptypes.h rename to contrib/lua-lpeg/lptypes.h diff --git a/contrib/lpeg/lpvm.c b/contrib/lua-lpeg/lpvm.c similarity index 100% rename from contrib/lpeg/lpvm.c rename to contrib/lua-lpeg/lpvm.c diff --git a/contrib/lpeg/lpvm.h b/contrib/lua-lpeg/lpvm.h similarity index 100% rename from contrib/lpeg/lpvm.h rename to contrib/lua-lpeg/lpvm.h diff --git a/contrib/moses/LICENSE b/contrib/lua-moses/LICENSE similarity index 100% rename from contrib/moses/LICENSE rename to contrib/lua-moses/LICENSE diff --git a/contrib/moses/moses.lua b/contrib/lua-moses/moses.lua similarity index 100% rename from contrib/moses/moses.lua rename to contrib/lua-moses/moses.lua diff --git a/contrib/torch/decisiontree/CMakeLists.txt b/contrib/lua-torch/decisiontree/CMakeLists.txt similarity index 100% rename from contrib/torch/decisiontree/CMakeLists.txt rename to contrib/lua-torch/decisiontree/CMakeLists.txt diff --git a/contrib/torch/decisiontree/CartNode.lua b/contrib/lua-torch/decisiontree/CartNode.lua similarity index 100% rename from contrib/torch/decisiontree/CartNode.lua rename to contrib/lua-torch/decisiontree/CartNode.lua diff --git a/contrib/torch/decisiontree/CartTrainer.lua b/contrib/lua-torch/decisiontree/CartTrainer.lua similarity index 100% rename from contrib/torch/decisiontree/CartTrainer.lua rename to contrib/lua-torch/decisiontree/CartTrainer.lua diff --git a/contrib/torch/decisiontree/CartTree.lua b/contrib/lua-torch/decisiontree/CartTree.lua similarity index 100% rename from contrib/torch/decisiontree/CartTree.lua rename to contrib/lua-torch/decisiontree/CartTree.lua diff --git a/contrib/torch/decisiontree/DFD.lua b/contrib/lua-torch/decisiontree/DFD.lua similarity index 100% rename from contrib/torch/decisiontree/DFD.lua rename to contrib/lua-torch/decisiontree/DFD.lua diff --git a/contrib/torch/decisiontree/DataSet.lua b/contrib/lua-torch/decisiontree/DataSet.lua similarity index 100% rename from contrib/torch/decisiontree/DataSet.lua rename to contrib/lua-torch/decisiontree/DataSet.lua diff --git a/contrib/torch/decisiontree/DecisionForest.lua b/contrib/lua-torch/decisiontree/DecisionForest.lua similarity index 100% rename from contrib/torch/decisiontree/DecisionForest.lua rename to contrib/lua-torch/decisiontree/DecisionForest.lua diff --git a/contrib/torch/decisiontree/DecisionForestTrainer.lua b/contrib/lua-torch/decisiontree/DecisionForestTrainer.lua similarity index 100% rename from contrib/torch/decisiontree/DecisionForestTrainer.lua rename to contrib/lua-torch/decisiontree/DecisionForestTrainer.lua diff --git a/contrib/torch/decisiontree/DecisionTree.lua b/contrib/lua-torch/decisiontree/DecisionTree.lua similarity index 100% rename from contrib/torch/decisiontree/DecisionTree.lua rename to contrib/lua-torch/decisiontree/DecisionTree.lua diff --git a/contrib/torch/decisiontree/GBDT_common.h b/contrib/lua-torch/decisiontree/GBDT_common.h similarity index 100% rename from contrib/torch/decisiontree/GBDT_common.h rename to contrib/lua-torch/decisiontree/GBDT_common.h diff --git a/contrib/torch/decisiontree/GiniState.lua b/contrib/lua-torch/decisiontree/GiniState.lua similarity index 100% rename from contrib/torch/decisiontree/GiniState.lua rename to contrib/lua-torch/decisiontree/GiniState.lua diff --git a/contrib/torch/decisiontree/GradientBoostState.lua b/contrib/lua-torch/decisiontree/GradientBoostState.lua similarity index 100% rename from contrib/torch/decisiontree/GradientBoostState.lua rename to contrib/lua-torch/decisiontree/GradientBoostState.lua diff --git a/contrib/torch/decisiontree/GradientBoostTrainer.lua b/contrib/lua-torch/decisiontree/GradientBoostTrainer.lua similarity index 100% rename from contrib/torch/decisiontree/GradientBoostTrainer.lua rename to contrib/lua-torch/decisiontree/GradientBoostTrainer.lua diff --git a/contrib/torch/decisiontree/LICENSE b/contrib/lua-torch/decisiontree/LICENSE similarity index 100% rename from contrib/torch/decisiontree/LICENSE rename to contrib/lua-torch/decisiontree/LICENSE diff --git a/contrib/torch/decisiontree/LogitBoostCriterion.lua b/contrib/lua-torch/decisiontree/LogitBoostCriterion.lua similarity index 100% rename from contrib/torch/decisiontree/LogitBoostCriterion.lua rename to contrib/lua-torch/decisiontree/LogitBoostCriterion.lua diff --git a/contrib/torch/decisiontree/MSECriterion.lua b/contrib/lua-torch/decisiontree/MSECriterion.lua similarity index 100% rename from contrib/torch/decisiontree/MSECriterion.lua rename to contrib/lua-torch/decisiontree/MSECriterion.lua diff --git a/contrib/torch/decisiontree/README.md b/contrib/lua-torch/decisiontree/README.md similarity index 100% rename from contrib/torch/decisiontree/README.md rename to contrib/lua-torch/decisiontree/README.md diff --git a/contrib/torch/decisiontree/RandomForestTrainer.lua b/contrib/lua-torch/decisiontree/RandomForestTrainer.lua similarity index 100% rename from contrib/torch/decisiontree/RandomForestTrainer.lua rename to contrib/lua-torch/decisiontree/RandomForestTrainer.lua diff --git a/contrib/torch/decisiontree/Sparse2Dense.lua b/contrib/lua-torch/decisiontree/Sparse2Dense.lua similarity index 100% rename from contrib/torch/decisiontree/Sparse2Dense.lua rename to contrib/lua-torch/decisiontree/Sparse2Dense.lua diff --git a/contrib/torch/decisiontree/SparseTensor.lua b/contrib/lua-torch/decisiontree/SparseTensor.lua similarity index 100% rename from contrib/torch/decisiontree/SparseTensor.lua rename to contrib/lua-torch/decisiontree/SparseTensor.lua diff --git a/contrib/torch/decisiontree/TreeState.lua b/contrib/lua-torch/decisiontree/TreeState.lua similarity index 100% rename from contrib/torch/decisiontree/TreeState.lua rename to contrib/lua-torch/decisiontree/TreeState.lua diff --git a/contrib/torch/decisiontree/WorkPool.lua b/contrib/lua-torch/decisiontree/WorkPool.lua similarity index 100% rename from contrib/torch/decisiontree/WorkPool.lua rename to contrib/lua-torch/decisiontree/WorkPool.lua diff --git a/contrib/torch/decisiontree/_env.lua b/contrib/lua-torch/decisiontree/_env.lua similarity index 100% rename from contrib/torch/decisiontree/_env.lua rename to contrib/lua-torch/decisiontree/_env.lua diff --git a/contrib/torch/decisiontree/benchmark.lua b/contrib/lua-torch/decisiontree/benchmark.lua similarity index 100% rename from contrib/torch/decisiontree/benchmark.lua rename to contrib/lua-torch/decisiontree/benchmark.lua diff --git a/contrib/torch/decisiontree/doc/benchmark.md b/contrib/lua-torch/decisiontree/doc/benchmark.md similarity index 100% rename from contrib/torch/decisiontree/doc/benchmark.md rename to contrib/lua-torch/decisiontree/doc/benchmark.md diff --git a/contrib/torch/decisiontree/error.h b/contrib/lua-torch/decisiontree/error.h similarity index 100% rename from contrib/torch/decisiontree/error.h rename to contrib/lua-torch/decisiontree/error.h diff --git a/contrib/torch/decisiontree/generic/CartTree.c b/contrib/lua-torch/decisiontree/generic/CartTree.c similarity index 100% rename from contrib/torch/decisiontree/generic/CartTree.c rename to contrib/lua-torch/decisiontree/generic/CartTree.c diff --git a/contrib/torch/decisiontree/generic/DFD.c b/contrib/lua-torch/decisiontree/generic/DFD.c similarity index 100% rename from contrib/torch/decisiontree/generic/DFD.c rename to contrib/lua-torch/decisiontree/generic/DFD.c diff --git a/contrib/torch/decisiontree/generic/GBDT.c b/contrib/lua-torch/decisiontree/generic/GBDT.c similarity index 100% rename from contrib/torch/decisiontree/generic/GBDT.c rename to contrib/lua-torch/decisiontree/generic/GBDT.c diff --git a/contrib/torch/decisiontree/generic/GBDT_internal.c b/contrib/lua-torch/decisiontree/generic/GBDT_internal.c similarity index 100% rename from contrib/torch/decisiontree/generic/GBDT_internal.c rename to contrib/lua-torch/decisiontree/generic/GBDT_internal.c diff --git a/contrib/torch/decisiontree/generic/GBDT_internal.h b/contrib/lua-torch/decisiontree/generic/GBDT_internal.h similarity index 100% rename from contrib/torch/decisiontree/generic/GBDT_internal.h rename to contrib/lua-torch/decisiontree/generic/GBDT_internal.h diff --git a/contrib/torch/decisiontree/generic/LogitBoostCriterion.c b/contrib/lua-torch/decisiontree/generic/LogitBoostCriterion.c similarity index 100% rename from contrib/torch/decisiontree/generic/LogitBoostCriterion.c rename to contrib/lua-torch/decisiontree/generic/LogitBoostCriterion.c diff --git a/contrib/torch/decisiontree/generic/S2D.c b/contrib/lua-torch/decisiontree/generic/S2D.c similarity index 100% rename from contrib/torch/decisiontree/generic/S2D.c rename to contrib/lua-torch/decisiontree/generic/S2D.c diff --git a/contrib/torch/decisiontree/hash_map.c b/contrib/lua-torch/decisiontree/hash_map.c similarity index 100% rename from contrib/torch/decisiontree/hash_map.c rename to contrib/lua-torch/decisiontree/hash_map.c diff --git a/contrib/torch/decisiontree/hash_map.h b/contrib/lua-torch/decisiontree/hash_map.h similarity index 100% rename from contrib/torch/decisiontree/hash_map.h rename to contrib/lua-torch/decisiontree/hash_map.h diff --git a/contrib/torch/decisiontree/init.c b/contrib/lua-torch/decisiontree/init.c similarity index 100% rename from contrib/torch/decisiontree/init.c rename to contrib/lua-torch/decisiontree/init.c diff --git a/contrib/torch/decisiontree/init.lua b/contrib/lua-torch/decisiontree/init.lua similarity index 100% rename from contrib/torch/decisiontree/init.lua rename to contrib/lua-torch/decisiontree/init.lua diff --git a/contrib/torch/decisiontree/internal_hash_map.h b/contrib/lua-torch/decisiontree/internal_hash_map.h similarity index 100% rename from contrib/torch/decisiontree/internal_hash_map.h rename to contrib/lua-torch/decisiontree/internal_hash_map.h diff --git a/contrib/torch/decisiontree/khash.h b/contrib/lua-torch/decisiontree/khash.h similarity index 100% rename from contrib/torch/decisiontree/khash.h rename to contrib/lua-torch/decisiontree/khash.h diff --git a/contrib/torch/decisiontree/math.lua b/contrib/lua-torch/decisiontree/math.lua similarity index 100% rename from contrib/torch/decisiontree/math.lua rename to contrib/lua-torch/decisiontree/math.lua diff --git a/contrib/torch/decisiontree/rocks/decisiontree-scm-1.rockspec b/contrib/lua-torch/decisiontree/rocks/decisiontree-scm-1.rockspec similarity index 100% rename from contrib/torch/decisiontree/rocks/decisiontree-scm-1.rockspec rename to contrib/lua-torch/decisiontree/rocks/decisiontree-scm-1.rockspec diff --git a/contrib/torch/decisiontree/test.lua b/contrib/lua-torch/decisiontree/test.lua similarity index 100% rename from contrib/torch/decisiontree/test.lua rename to contrib/lua-torch/decisiontree/test.lua diff --git a/contrib/torch/decisiontree/utils.h b/contrib/lua-torch/decisiontree/utils.h similarity index 100% rename from contrib/torch/decisiontree/utils.h rename to contrib/lua-torch/decisiontree/utils.h diff --git a/contrib/torch/decisiontree/utils.lua b/contrib/lua-torch/decisiontree/utils.lua similarity index 100% rename from contrib/torch/decisiontree/utils.lua rename to contrib/lua-torch/decisiontree/utils.lua diff --git a/contrib/torch/nn/.gitignore b/contrib/lua-torch/nn/.gitignore similarity index 100% rename from contrib/torch/nn/.gitignore rename to contrib/lua-torch/nn/.gitignore diff --git a/contrib/torch/nn/.luacheckrc b/contrib/lua-torch/nn/.luacheckrc similarity index 100% rename from contrib/torch/nn/.luacheckrc rename to contrib/lua-torch/nn/.luacheckrc diff --git a/contrib/torch/nn/.travis.yml b/contrib/lua-torch/nn/.travis.yml similarity index 100% rename from contrib/torch/nn/.travis.yml rename to contrib/lua-torch/nn/.travis.yml diff --git a/contrib/torch/nn/Abs.lua b/contrib/lua-torch/nn/Abs.lua similarity index 100% rename from contrib/torch/nn/Abs.lua rename to contrib/lua-torch/nn/Abs.lua diff --git a/contrib/torch/nn/AbsCriterion.lua b/contrib/lua-torch/nn/AbsCriterion.lua similarity index 100% rename from contrib/torch/nn/AbsCriterion.lua rename to contrib/lua-torch/nn/AbsCriterion.lua diff --git a/contrib/torch/nn/Add.lua b/contrib/lua-torch/nn/Add.lua similarity index 100% rename from contrib/torch/nn/Add.lua rename to contrib/lua-torch/nn/Add.lua diff --git a/contrib/torch/nn/AddConstant.lua b/contrib/lua-torch/nn/AddConstant.lua similarity index 100% rename from contrib/torch/nn/AddConstant.lua rename to contrib/lua-torch/nn/AddConstant.lua diff --git a/contrib/torch/nn/BCECriterion.lua b/contrib/lua-torch/nn/BCECriterion.lua similarity index 100% rename from contrib/torch/nn/BCECriterion.lua rename to contrib/lua-torch/nn/BCECriterion.lua diff --git a/contrib/torch/nn/BatchNormalization.lua b/contrib/lua-torch/nn/BatchNormalization.lua similarity index 100% rename from contrib/torch/nn/BatchNormalization.lua rename to contrib/lua-torch/nn/BatchNormalization.lua diff --git a/contrib/torch/nn/Bilinear.lua b/contrib/lua-torch/nn/Bilinear.lua similarity index 100% rename from contrib/torch/nn/Bilinear.lua rename to contrib/lua-torch/nn/Bilinear.lua diff --git a/contrib/torch/nn/Bottle.lua b/contrib/lua-torch/nn/Bottle.lua similarity index 100% rename from contrib/torch/nn/Bottle.lua rename to contrib/lua-torch/nn/Bottle.lua diff --git a/contrib/torch/nn/CAdd.lua b/contrib/lua-torch/nn/CAdd.lua similarity index 100% rename from contrib/torch/nn/CAdd.lua rename to contrib/lua-torch/nn/CAdd.lua diff --git a/contrib/torch/nn/CAddTable.lua b/contrib/lua-torch/nn/CAddTable.lua similarity index 100% rename from contrib/torch/nn/CAddTable.lua rename to contrib/lua-torch/nn/CAddTable.lua diff --git a/contrib/torch/nn/CAddTensorTable.lua b/contrib/lua-torch/nn/CAddTensorTable.lua similarity index 100% rename from contrib/torch/nn/CAddTensorTable.lua rename to contrib/lua-torch/nn/CAddTensorTable.lua diff --git a/contrib/torch/nn/CDivTable.lua b/contrib/lua-torch/nn/CDivTable.lua similarity index 100% rename from contrib/torch/nn/CDivTable.lua rename to contrib/lua-torch/nn/CDivTable.lua diff --git a/contrib/torch/nn/CMakeLists.txt b/contrib/lua-torch/nn/CMakeLists.txt similarity index 100% rename from contrib/torch/nn/CMakeLists.txt rename to contrib/lua-torch/nn/CMakeLists.txt diff --git a/contrib/torch/nn/CMaxTable.lua b/contrib/lua-torch/nn/CMaxTable.lua similarity index 100% rename from contrib/torch/nn/CMaxTable.lua rename to contrib/lua-torch/nn/CMaxTable.lua diff --git a/contrib/torch/nn/CMinTable.lua b/contrib/lua-torch/nn/CMinTable.lua similarity index 100% rename from contrib/torch/nn/CMinTable.lua rename to contrib/lua-torch/nn/CMinTable.lua diff --git a/contrib/torch/nn/CMul.lua b/contrib/lua-torch/nn/CMul.lua similarity index 100% rename from contrib/torch/nn/CMul.lua rename to contrib/lua-torch/nn/CMul.lua diff --git a/contrib/torch/nn/CMulTable.lua b/contrib/lua-torch/nn/CMulTable.lua similarity index 100% rename from contrib/torch/nn/CMulTable.lua rename to contrib/lua-torch/nn/CMulTable.lua diff --git a/contrib/torch/nn/CONTRIBUTING.md b/contrib/lua-torch/nn/CONTRIBUTING.md similarity index 100% rename from contrib/torch/nn/CONTRIBUTING.md rename to contrib/lua-torch/nn/CONTRIBUTING.md diff --git a/contrib/torch/nn/COPYRIGHT.txt b/contrib/lua-torch/nn/COPYRIGHT.txt similarity index 100% rename from contrib/torch/nn/COPYRIGHT.txt rename to contrib/lua-torch/nn/COPYRIGHT.txt diff --git a/contrib/torch/nn/CReLU.lua b/contrib/lua-torch/nn/CReLU.lua similarity index 100% rename from contrib/torch/nn/CReLU.lua rename to contrib/lua-torch/nn/CReLU.lua diff --git a/contrib/torch/nn/CSubTable.lua b/contrib/lua-torch/nn/CSubTable.lua similarity index 100% rename from contrib/torch/nn/CSubTable.lua rename to contrib/lua-torch/nn/CSubTable.lua diff --git a/contrib/torch/nn/Clamp.lua b/contrib/lua-torch/nn/Clamp.lua similarity index 100% rename from contrib/torch/nn/Clamp.lua rename to contrib/lua-torch/nn/Clamp.lua diff --git a/contrib/torch/nn/ClassNLLCriterion.lua b/contrib/lua-torch/nn/ClassNLLCriterion.lua similarity index 100% rename from contrib/torch/nn/ClassNLLCriterion.lua rename to contrib/lua-torch/nn/ClassNLLCriterion.lua diff --git a/contrib/torch/nn/ClassSimplexCriterion.lua b/contrib/lua-torch/nn/ClassSimplexCriterion.lua similarity index 100% rename from contrib/torch/nn/ClassSimplexCriterion.lua rename to contrib/lua-torch/nn/ClassSimplexCriterion.lua diff --git a/contrib/torch/nn/Collapse.lua b/contrib/lua-torch/nn/Collapse.lua similarity index 100% rename from contrib/torch/nn/Collapse.lua rename to contrib/lua-torch/nn/Collapse.lua diff --git a/contrib/torch/nn/Concat.lua b/contrib/lua-torch/nn/Concat.lua similarity index 100% rename from contrib/torch/nn/Concat.lua rename to contrib/lua-torch/nn/Concat.lua diff --git a/contrib/torch/nn/ConcatTable.lua b/contrib/lua-torch/nn/ConcatTable.lua similarity index 100% rename from contrib/torch/nn/ConcatTable.lua rename to contrib/lua-torch/nn/ConcatTable.lua diff --git a/contrib/torch/nn/Constant.lua b/contrib/lua-torch/nn/Constant.lua similarity index 100% rename from contrib/torch/nn/Constant.lua rename to contrib/lua-torch/nn/Constant.lua diff --git a/contrib/torch/nn/Container.lua b/contrib/lua-torch/nn/Container.lua similarity index 100% rename from contrib/torch/nn/Container.lua rename to contrib/lua-torch/nn/Container.lua diff --git a/contrib/torch/nn/Contiguous.lua b/contrib/lua-torch/nn/Contiguous.lua similarity index 100% rename from contrib/torch/nn/Contiguous.lua rename to contrib/lua-torch/nn/Contiguous.lua diff --git a/contrib/torch/nn/Convert.lua b/contrib/lua-torch/nn/Convert.lua similarity index 100% rename from contrib/torch/nn/Convert.lua rename to contrib/lua-torch/nn/Convert.lua diff --git a/contrib/torch/nn/Copy.lua b/contrib/lua-torch/nn/Copy.lua similarity index 100% rename from contrib/torch/nn/Copy.lua rename to contrib/lua-torch/nn/Copy.lua diff --git a/contrib/torch/nn/Cosine.lua b/contrib/lua-torch/nn/Cosine.lua similarity index 100% rename from contrib/torch/nn/Cosine.lua rename to contrib/lua-torch/nn/Cosine.lua diff --git a/contrib/torch/nn/CosineDistance.lua b/contrib/lua-torch/nn/CosineDistance.lua similarity index 100% rename from contrib/torch/nn/CosineDistance.lua rename to contrib/lua-torch/nn/CosineDistance.lua diff --git a/contrib/torch/nn/CosineEmbeddingCriterion.lua b/contrib/lua-torch/nn/CosineEmbeddingCriterion.lua similarity index 100% rename from contrib/torch/nn/CosineEmbeddingCriterion.lua rename to contrib/lua-torch/nn/CosineEmbeddingCriterion.lua diff --git a/contrib/torch/nn/Criterion.lua b/contrib/lua-torch/nn/Criterion.lua similarity index 100% rename from contrib/torch/nn/Criterion.lua rename to contrib/lua-torch/nn/Criterion.lua diff --git a/contrib/torch/nn/CriterionTable.lua b/contrib/lua-torch/nn/CriterionTable.lua similarity index 100% rename from contrib/torch/nn/CriterionTable.lua rename to contrib/lua-torch/nn/CriterionTable.lua diff --git a/contrib/torch/nn/CrossEntropyCriterion.lua b/contrib/lua-torch/nn/CrossEntropyCriterion.lua similarity index 100% rename from contrib/torch/nn/CrossEntropyCriterion.lua rename to contrib/lua-torch/nn/CrossEntropyCriterion.lua diff --git a/contrib/torch/nn/Decorator.lua b/contrib/lua-torch/nn/Decorator.lua similarity index 100% rename from contrib/torch/nn/Decorator.lua rename to contrib/lua-torch/nn/Decorator.lua diff --git a/contrib/torch/nn/DepthConcat.lua b/contrib/lua-torch/nn/DepthConcat.lua similarity index 100% rename from contrib/torch/nn/DepthConcat.lua rename to contrib/lua-torch/nn/DepthConcat.lua diff --git a/contrib/torch/nn/DistKLDivCriterion.lua b/contrib/lua-torch/nn/DistKLDivCriterion.lua similarity index 100% rename from contrib/torch/nn/DistKLDivCriterion.lua rename to contrib/lua-torch/nn/DistKLDivCriterion.lua diff --git a/contrib/torch/nn/DistanceRatioCriterion.lua b/contrib/lua-torch/nn/DistanceRatioCriterion.lua similarity index 100% rename from contrib/torch/nn/DistanceRatioCriterion.lua rename to contrib/lua-torch/nn/DistanceRatioCriterion.lua diff --git a/contrib/torch/nn/DontCast.lua b/contrib/lua-torch/nn/DontCast.lua similarity index 100% rename from contrib/torch/nn/DontCast.lua rename to contrib/lua-torch/nn/DontCast.lua diff --git a/contrib/torch/nn/DotProduct.lua b/contrib/lua-torch/nn/DotProduct.lua similarity index 100% rename from contrib/torch/nn/DotProduct.lua rename to contrib/lua-torch/nn/DotProduct.lua diff --git a/contrib/torch/nn/Dropout.lua b/contrib/lua-torch/nn/Dropout.lua similarity index 100% rename from contrib/torch/nn/Dropout.lua rename to contrib/lua-torch/nn/Dropout.lua diff --git a/contrib/torch/nn/ELU.lua b/contrib/lua-torch/nn/ELU.lua similarity index 100% rename from contrib/torch/nn/ELU.lua rename to contrib/lua-torch/nn/ELU.lua diff --git a/contrib/torch/nn/ErrorMessages.lua b/contrib/lua-torch/nn/ErrorMessages.lua similarity index 100% rename from contrib/torch/nn/ErrorMessages.lua rename to contrib/lua-torch/nn/ErrorMessages.lua diff --git a/contrib/torch/nn/Euclidean.lua b/contrib/lua-torch/nn/Euclidean.lua similarity index 100% rename from contrib/torch/nn/Euclidean.lua rename to contrib/lua-torch/nn/Euclidean.lua diff --git a/contrib/torch/nn/Exp.lua b/contrib/lua-torch/nn/Exp.lua similarity index 100% rename from contrib/torch/nn/Exp.lua rename to contrib/lua-torch/nn/Exp.lua diff --git a/contrib/torch/nn/FlattenTable.lua b/contrib/lua-torch/nn/FlattenTable.lua similarity index 100% rename from contrib/torch/nn/FlattenTable.lua rename to contrib/lua-torch/nn/FlattenTable.lua diff --git a/contrib/torch/nn/GPU.lua b/contrib/lua-torch/nn/GPU.lua similarity index 100% rename from contrib/torch/nn/GPU.lua rename to contrib/lua-torch/nn/GPU.lua diff --git a/contrib/torch/nn/GatedLinearUnit.lua b/contrib/lua-torch/nn/GatedLinearUnit.lua similarity index 100% rename from contrib/torch/nn/GatedLinearUnit.lua rename to contrib/lua-torch/nn/GatedLinearUnit.lua diff --git a/contrib/torch/nn/GradientReversal.lua b/contrib/lua-torch/nn/GradientReversal.lua similarity index 100% rename from contrib/torch/nn/GradientReversal.lua rename to contrib/lua-torch/nn/GradientReversal.lua diff --git a/contrib/torch/nn/HardShrink.lua b/contrib/lua-torch/nn/HardShrink.lua similarity index 100% rename from contrib/torch/nn/HardShrink.lua rename to contrib/lua-torch/nn/HardShrink.lua diff --git a/contrib/torch/nn/HardTanh.lua b/contrib/lua-torch/nn/HardTanh.lua similarity index 100% rename from contrib/torch/nn/HardTanh.lua rename to contrib/lua-torch/nn/HardTanh.lua diff --git a/contrib/torch/nn/HingeEmbeddingCriterion.lua b/contrib/lua-torch/nn/HingeEmbeddingCriterion.lua similarity index 100% rename from contrib/torch/nn/HingeEmbeddingCriterion.lua rename to contrib/lua-torch/nn/HingeEmbeddingCriterion.lua diff --git a/contrib/torch/nn/Identity.lua b/contrib/lua-torch/nn/Identity.lua similarity index 100% rename from contrib/torch/nn/Identity.lua rename to contrib/lua-torch/nn/Identity.lua diff --git a/contrib/torch/nn/Index.lua b/contrib/lua-torch/nn/Index.lua similarity index 100% rename from contrib/torch/nn/Index.lua rename to contrib/lua-torch/nn/Index.lua diff --git a/contrib/torch/nn/IndexLinear.lua b/contrib/lua-torch/nn/IndexLinear.lua similarity index 100% rename from contrib/torch/nn/IndexLinear.lua rename to contrib/lua-torch/nn/IndexLinear.lua diff --git a/contrib/torch/nn/Jacobian.lua b/contrib/lua-torch/nn/Jacobian.lua similarity index 100% rename from contrib/torch/nn/Jacobian.lua rename to contrib/lua-torch/nn/Jacobian.lua diff --git a/contrib/torch/nn/JoinTable.lua b/contrib/lua-torch/nn/JoinTable.lua similarity index 100% rename from contrib/torch/nn/JoinTable.lua rename to contrib/lua-torch/nn/JoinTable.lua diff --git a/contrib/torch/nn/Kmeans.lua b/contrib/lua-torch/nn/Kmeans.lua similarity index 100% rename from contrib/torch/nn/Kmeans.lua rename to contrib/lua-torch/nn/Kmeans.lua diff --git a/contrib/torch/nn/L1Cost.lua b/contrib/lua-torch/nn/L1Cost.lua similarity index 100% rename from contrib/torch/nn/L1Cost.lua rename to contrib/lua-torch/nn/L1Cost.lua diff --git a/contrib/torch/nn/L1HingeEmbeddingCriterion.lua b/contrib/lua-torch/nn/L1HingeEmbeddingCriterion.lua similarity index 100% rename from contrib/torch/nn/L1HingeEmbeddingCriterion.lua rename to contrib/lua-torch/nn/L1HingeEmbeddingCriterion.lua diff --git a/contrib/torch/nn/L1Penalty.lua b/contrib/lua-torch/nn/L1Penalty.lua similarity index 100% rename from contrib/torch/nn/L1Penalty.lua rename to contrib/lua-torch/nn/L1Penalty.lua diff --git a/contrib/torch/nn/LayerNormalization.lua b/contrib/lua-torch/nn/LayerNormalization.lua similarity index 100% rename from contrib/torch/nn/LayerNormalization.lua rename to contrib/lua-torch/nn/LayerNormalization.lua diff --git a/contrib/torch/nn/LeakyReLU.lua b/contrib/lua-torch/nn/LeakyReLU.lua similarity index 100% rename from contrib/torch/nn/LeakyReLU.lua rename to contrib/lua-torch/nn/LeakyReLU.lua diff --git a/contrib/torch/nn/Linear.lua b/contrib/lua-torch/nn/Linear.lua similarity index 100% rename from contrib/torch/nn/Linear.lua rename to contrib/lua-torch/nn/Linear.lua diff --git a/contrib/torch/nn/LinearWeightNorm.lua b/contrib/lua-torch/nn/LinearWeightNorm.lua similarity index 100% rename from contrib/torch/nn/LinearWeightNorm.lua rename to contrib/lua-torch/nn/LinearWeightNorm.lua diff --git a/contrib/torch/nn/Log.lua b/contrib/lua-torch/nn/Log.lua similarity index 100% rename from contrib/torch/nn/Log.lua rename to contrib/lua-torch/nn/Log.lua diff --git a/contrib/torch/nn/LogSigmoid.lua b/contrib/lua-torch/nn/LogSigmoid.lua similarity index 100% rename from contrib/torch/nn/LogSigmoid.lua rename to contrib/lua-torch/nn/LogSigmoid.lua diff --git a/contrib/torch/nn/LogSoftMax.lua b/contrib/lua-torch/nn/LogSoftMax.lua similarity index 100% rename from contrib/torch/nn/LogSoftMax.lua rename to contrib/lua-torch/nn/LogSoftMax.lua diff --git a/contrib/torch/nn/LookupTable.lua b/contrib/lua-torch/nn/LookupTable.lua similarity index 100% rename from contrib/torch/nn/LookupTable.lua rename to contrib/lua-torch/nn/LookupTable.lua diff --git a/contrib/torch/nn/MM.lua b/contrib/lua-torch/nn/MM.lua similarity index 100% rename from contrib/torch/nn/MM.lua rename to contrib/lua-torch/nn/MM.lua diff --git a/contrib/torch/nn/MSECriterion.lua b/contrib/lua-torch/nn/MSECriterion.lua similarity index 100% rename from contrib/torch/nn/MSECriterion.lua rename to contrib/lua-torch/nn/MSECriterion.lua diff --git a/contrib/torch/nn/MV.lua b/contrib/lua-torch/nn/MV.lua similarity index 100% rename from contrib/torch/nn/MV.lua rename to contrib/lua-torch/nn/MV.lua diff --git a/contrib/torch/nn/MapTable.lua b/contrib/lua-torch/nn/MapTable.lua similarity index 100% rename from contrib/torch/nn/MapTable.lua rename to contrib/lua-torch/nn/MapTable.lua diff --git a/contrib/torch/nn/MarginCriterion.lua b/contrib/lua-torch/nn/MarginCriterion.lua similarity index 100% rename from contrib/torch/nn/MarginCriterion.lua rename to contrib/lua-torch/nn/MarginCriterion.lua diff --git a/contrib/torch/nn/MarginRankingCriterion.lua b/contrib/lua-torch/nn/MarginRankingCriterion.lua similarity index 100% rename from contrib/torch/nn/MarginRankingCriterion.lua rename to contrib/lua-torch/nn/MarginRankingCriterion.lua diff --git a/contrib/torch/nn/MaskedSelect.lua b/contrib/lua-torch/nn/MaskedSelect.lua similarity index 100% rename from contrib/torch/nn/MaskedSelect.lua rename to contrib/lua-torch/nn/MaskedSelect.lua diff --git a/contrib/torch/nn/Max.lua b/contrib/lua-torch/nn/Max.lua similarity index 100% rename from contrib/torch/nn/Max.lua rename to contrib/lua-torch/nn/Max.lua diff --git a/contrib/torch/nn/Maxout.lua b/contrib/lua-torch/nn/Maxout.lua similarity index 100% rename from contrib/torch/nn/Maxout.lua rename to contrib/lua-torch/nn/Maxout.lua diff --git a/contrib/torch/nn/Mean.lua b/contrib/lua-torch/nn/Mean.lua similarity index 100% rename from contrib/torch/nn/Mean.lua rename to contrib/lua-torch/nn/Mean.lua diff --git a/contrib/torch/nn/Min.lua b/contrib/lua-torch/nn/Min.lua similarity index 100% rename from contrib/torch/nn/Min.lua rename to contrib/lua-torch/nn/Min.lua diff --git a/contrib/torch/nn/MixtureTable.lua b/contrib/lua-torch/nn/MixtureTable.lua similarity index 100% rename from contrib/torch/nn/MixtureTable.lua rename to contrib/lua-torch/nn/MixtureTable.lua diff --git a/contrib/torch/nn/Module.lua b/contrib/lua-torch/nn/Module.lua similarity index 100% rename from contrib/torch/nn/Module.lua rename to contrib/lua-torch/nn/Module.lua diff --git a/contrib/torch/nn/ModuleCriterion.lua b/contrib/lua-torch/nn/ModuleCriterion.lua similarity index 100% rename from contrib/torch/nn/ModuleCriterion.lua rename to contrib/lua-torch/nn/ModuleCriterion.lua diff --git a/contrib/torch/nn/Mul.lua b/contrib/lua-torch/nn/Mul.lua similarity index 100% rename from contrib/torch/nn/Mul.lua rename to contrib/lua-torch/nn/Mul.lua diff --git a/contrib/torch/nn/MulConstant.lua b/contrib/lua-torch/nn/MulConstant.lua similarity index 100% rename from contrib/torch/nn/MulConstant.lua rename to contrib/lua-torch/nn/MulConstant.lua diff --git a/contrib/torch/nn/MultiCriterion.lua b/contrib/lua-torch/nn/MultiCriterion.lua similarity index 100% rename from contrib/torch/nn/MultiCriterion.lua rename to contrib/lua-torch/nn/MultiCriterion.lua diff --git a/contrib/torch/nn/MultiLabelMarginCriterion.lua b/contrib/lua-torch/nn/MultiLabelMarginCriterion.lua similarity index 100% rename from contrib/torch/nn/MultiLabelMarginCriterion.lua rename to contrib/lua-torch/nn/MultiLabelMarginCriterion.lua diff --git a/contrib/torch/nn/MultiLabelSoftMarginCriterion.lua b/contrib/lua-torch/nn/MultiLabelSoftMarginCriterion.lua similarity index 100% rename from contrib/torch/nn/MultiLabelSoftMarginCriterion.lua rename to contrib/lua-torch/nn/MultiLabelSoftMarginCriterion.lua diff --git a/contrib/torch/nn/MultiMarginCriterion.lua b/contrib/lua-torch/nn/MultiMarginCriterion.lua similarity index 100% rename from contrib/torch/nn/MultiMarginCriterion.lua rename to contrib/lua-torch/nn/MultiMarginCriterion.lua diff --git a/contrib/torch/nn/NaN.lua b/contrib/lua-torch/nn/NaN.lua similarity index 100% rename from contrib/torch/nn/NaN.lua rename to contrib/lua-torch/nn/NaN.lua diff --git a/contrib/torch/nn/Narrow.lua b/contrib/lua-torch/nn/Narrow.lua similarity index 100% rename from contrib/torch/nn/Narrow.lua rename to contrib/lua-torch/nn/Narrow.lua diff --git a/contrib/torch/nn/NarrowTable.lua b/contrib/lua-torch/nn/NarrowTable.lua similarity index 100% rename from contrib/torch/nn/NarrowTable.lua rename to contrib/lua-torch/nn/NarrowTable.lua diff --git a/contrib/torch/nn/Normalize.lua b/contrib/lua-torch/nn/Normalize.lua similarity index 100% rename from contrib/torch/nn/Normalize.lua rename to contrib/lua-torch/nn/Normalize.lua diff --git a/contrib/torch/nn/OneHot.lua b/contrib/lua-torch/nn/OneHot.lua similarity index 100% rename from contrib/torch/nn/OneHot.lua rename to contrib/lua-torch/nn/OneHot.lua diff --git a/contrib/torch/nn/PReLU.lua b/contrib/lua-torch/nn/PReLU.lua similarity index 100% rename from contrib/torch/nn/PReLU.lua rename to contrib/lua-torch/nn/PReLU.lua diff --git a/contrib/torch/nn/Padding.lua b/contrib/lua-torch/nn/Padding.lua similarity index 100% rename from contrib/torch/nn/Padding.lua rename to contrib/lua-torch/nn/Padding.lua diff --git a/contrib/torch/nn/PairwiseDistance.lua b/contrib/lua-torch/nn/PairwiseDistance.lua similarity index 100% rename from contrib/torch/nn/PairwiseDistance.lua rename to contrib/lua-torch/nn/PairwiseDistance.lua diff --git a/contrib/torch/nn/Parallel.lua b/contrib/lua-torch/nn/Parallel.lua similarity index 100% rename from contrib/torch/nn/Parallel.lua rename to contrib/lua-torch/nn/Parallel.lua diff --git a/contrib/torch/nn/ParallelCriterion.lua b/contrib/lua-torch/nn/ParallelCriterion.lua similarity index 100% rename from contrib/torch/nn/ParallelCriterion.lua rename to contrib/lua-torch/nn/ParallelCriterion.lua diff --git a/contrib/torch/nn/ParallelTable.lua b/contrib/lua-torch/nn/ParallelTable.lua similarity index 100% rename from contrib/torch/nn/ParallelTable.lua rename to contrib/lua-torch/nn/ParallelTable.lua diff --git a/contrib/torch/nn/PartialLinear.lua b/contrib/lua-torch/nn/PartialLinear.lua similarity index 100% rename from contrib/torch/nn/PartialLinear.lua rename to contrib/lua-torch/nn/PartialLinear.lua diff --git a/contrib/torch/nn/PixelShuffle.lua b/contrib/lua-torch/nn/PixelShuffle.lua similarity index 100% rename from contrib/torch/nn/PixelShuffle.lua rename to contrib/lua-torch/nn/PixelShuffle.lua diff --git a/contrib/torch/nn/Power.lua b/contrib/lua-torch/nn/Power.lua similarity index 100% rename from contrib/torch/nn/Power.lua rename to contrib/lua-torch/nn/Power.lua diff --git a/contrib/torch/nn/PrintSize.lua b/contrib/lua-torch/nn/PrintSize.lua similarity index 100% rename from contrib/torch/nn/PrintSize.lua rename to contrib/lua-torch/nn/PrintSize.lua diff --git a/contrib/torch/nn/Profile.lua b/contrib/lua-torch/nn/Profile.lua similarity index 100% rename from contrib/torch/nn/Profile.lua rename to contrib/lua-torch/nn/Profile.lua diff --git a/contrib/torch/nn/README.md b/contrib/lua-torch/nn/README.md similarity index 100% rename from contrib/torch/nn/README.md rename to contrib/lua-torch/nn/README.md diff --git a/contrib/torch/nn/RReLU.lua b/contrib/lua-torch/nn/RReLU.lua similarity index 100% rename from contrib/torch/nn/RReLU.lua rename to contrib/lua-torch/nn/RReLU.lua diff --git a/contrib/torch/nn/ReLU.lua b/contrib/lua-torch/nn/ReLU.lua similarity index 100% rename from contrib/torch/nn/ReLU.lua rename to contrib/lua-torch/nn/ReLU.lua diff --git a/contrib/torch/nn/ReLU6.lua b/contrib/lua-torch/nn/ReLU6.lua similarity index 100% rename from contrib/torch/nn/ReLU6.lua rename to contrib/lua-torch/nn/ReLU6.lua diff --git a/contrib/torch/nn/Replicate.lua b/contrib/lua-torch/nn/Replicate.lua similarity index 100% rename from contrib/torch/nn/Replicate.lua rename to contrib/lua-torch/nn/Replicate.lua diff --git a/contrib/torch/nn/Reshape.lua b/contrib/lua-torch/nn/Reshape.lua similarity index 100% rename from contrib/torch/nn/Reshape.lua rename to contrib/lua-torch/nn/Reshape.lua diff --git a/contrib/torch/nn/Select.lua b/contrib/lua-torch/nn/Select.lua similarity index 100% rename from contrib/torch/nn/Select.lua rename to contrib/lua-torch/nn/Select.lua diff --git a/contrib/torch/nn/SelectTable.lua b/contrib/lua-torch/nn/SelectTable.lua similarity index 100% rename from contrib/torch/nn/SelectTable.lua rename to contrib/lua-torch/nn/SelectTable.lua diff --git a/contrib/torch/nn/Sequential.lua b/contrib/lua-torch/nn/Sequential.lua similarity index 100% rename from contrib/torch/nn/Sequential.lua rename to contrib/lua-torch/nn/Sequential.lua diff --git a/contrib/torch/nn/Sigmoid.lua b/contrib/lua-torch/nn/Sigmoid.lua similarity index 100% rename from contrib/torch/nn/Sigmoid.lua rename to contrib/lua-torch/nn/Sigmoid.lua diff --git a/contrib/torch/nn/SmoothL1Criterion.lua b/contrib/lua-torch/nn/SmoothL1Criterion.lua similarity index 100% rename from contrib/torch/nn/SmoothL1Criterion.lua rename to contrib/lua-torch/nn/SmoothL1Criterion.lua diff --git a/contrib/torch/nn/SoftMarginCriterion.lua b/contrib/lua-torch/nn/SoftMarginCriterion.lua similarity index 100% rename from contrib/torch/nn/SoftMarginCriterion.lua rename to contrib/lua-torch/nn/SoftMarginCriterion.lua diff --git a/contrib/torch/nn/SoftMax.lua b/contrib/lua-torch/nn/SoftMax.lua similarity index 100% rename from contrib/torch/nn/SoftMax.lua rename to contrib/lua-torch/nn/SoftMax.lua diff --git a/contrib/torch/nn/SoftMin.lua b/contrib/lua-torch/nn/SoftMin.lua similarity index 100% rename from contrib/torch/nn/SoftMin.lua rename to contrib/lua-torch/nn/SoftMin.lua diff --git a/contrib/torch/nn/SoftPlus.lua b/contrib/lua-torch/nn/SoftPlus.lua similarity index 100% rename from contrib/torch/nn/SoftPlus.lua rename to contrib/lua-torch/nn/SoftPlus.lua diff --git a/contrib/torch/nn/SoftShrink.lua b/contrib/lua-torch/nn/SoftShrink.lua similarity index 100% rename from contrib/torch/nn/SoftShrink.lua rename to contrib/lua-torch/nn/SoftShrink.lua diff --git a/contrib/torch/nn/SoftSign.lua b/contrib/lua-torch/nn/SoftSign.lua similarity index 100% rename from contrib/torch/nn/SoftSign.lua rename to contrib/lua-torch/nn/SoftSign.lua diff --git a/contrib/torch/nn/SparseJacobian.lua b/contrib/lua-torch/nn/SparseJacobian.lua similarity index 100% rename from contrib/torch/nn/SparseJacobian.lua rename to contrib/lua-torch/nn/SparseJacobian.lua diff --git a/contrib/torch/nn/SparseLinear.lua b/contrib/lua-torch/nn/SparseLinear.lua similarity index 100% rename from contrib/torch/nn/SparseLinear.lua rename to contrib/lua-torch/nn/SparseLinear.lua diff --git a/contrib/torch/nn/SpatialAdaptiveAveragePooling.lua b/contrib/lua-torch/nn/SpatialAdaptiveAveragePooling.lua similarity index 100% rename from contrib/torch/nn/SpatialAdaptiveAveragePooling.lua rename to contrib/lua-torch/nn/SpatialAdaptiveAveragePooling.lua diff --git a/contrib/torch/nn/SpatialAdaptiveMaxPooling.lua b/contrib/lua-torch/nn/SpatialAdaptiveMaxPooling.lua similarity index 100% rename from contrib/torch/nn/SpatialAdaptiveMaxPooling.lua rename to contrib/lua-torch/nn/SpatialAdaptiveMaxPooling.lua diff --git a/contrib/torch/nn/SpatialAutoCropMSECriterion.lua b/contrib/lua-torch/nn/SpatialAutoCropMSECriterion.lua similarity index 100% rename from contrib/torch/nn/SpatialAutoCropMSECriterion.lua rename to contrib/lua-torch/nn/SpatialAutoCropMSECriterion.lua diff --git a/contrib/torch/nn/SpatialAveragePooling.lua b/contrib/lua-torch/nn/SpatialAveragePooling.lua similarity index 100% rename from contrib/torch/nn/SpatialAveragePooling.lua rename to contrib/lua-torch/nn/SpatialAveragePooling.lua diff --git a/contrib/torch/nn/SpatialBatchNormalization.lua b/contrib/lua-torch/nn/SpatialBatchNormalization.lua similarity index 100% rename from contrib/torch/nn/SpatialBatchNormalization.lua rename to contrib/lua-torch/nn/SpatialBatchNormalization.lua diff --git a/contrib/torch/nn/SpatialClassNLLCriterion.lua b/contrib/lua-torch/nn/SpatialClassNLLCriterion.lua similarity index 100% rename from contrib/torch/nn/SpatialClassNLLCriterion.lua rename to contrib/lua-torch/nn/SpatialClassNLLCriterion.lua diff --git a/contrib/torch/nn/SpatialContrastiveNormalization.lua b/contrib/lua-torch/nn/SpatialContrastiveNormalization.lua similarity index 100% rename from contrib/torch/nn/SpatialContrastiveNormalization.lua rename to contrib/lua-torch/nn/SpatialContrastiveNormalization.lua diff --git a/contrib/torch/nn/SpatialConvolution.lua b/contrib/lua-torch/nn/SpatialConvolution.lua similarity index 100% rename from contrib/torch/nn/SpatialConvolution.lua rename to contrib/lua-torch/nn/SpatialConvolution.lua diff --git a/contrib/torch/nn/SpatialConvolutionLocal.lua b/contrib/lua-torch/nn/SpatialConvolutionLocal.lua similarity index 100% rename from contrib/torch/nn/SpatialConvolutionLocal.lua rename to contrib/lua-torch/nn/SpatialConvolutionLocal.lua diff --git a/contrib/torch/nn/SpatialConvolutionMM.lua b/contrib/lua-torch/nn/SpatialConvolutionMM.lua similarity index 100% rename from contrib/torch/nn/SpatialConvolutionMM.lua rename to contrib/lua-torch/nn/SpatialConvolutionMM.lua diff --git a/contrib/torch/nn/SpatialConvolutionMap.lua b/contrib/lua-torch/nn/SpatialConvolutionMap.lua similarity index 100% rename from contrib/torch/nn/SpatialConvolutionMap.lua rename to contrib/lua-torch/nn/SpatialConvolutionMap.lua diff --git a/contrib/torch/nn/SpatialCrossMapLRN.lua b/contrib/lua-torch/nn/SpatialCrossMapLRN.lua similarity index 100% rename from contrib/torch/nn/SpatialCrossMapLRN.lua rename to contrib/lua-torch/nn/SpatialCrossMapLRN.lua diff --git a/contrib/torch/nn/SpatialDepthWiseConvolution.lua b/contrib/lua-torch/nn/SpatialDepthWiseConvolution.lua similarity index 100% rename from contrib/torch/nn/SpatialDepthWiseConvolution.lua rename to contrib/lua-torch/nn/SpatialDepthWiseConvolution.lua diff --git a/contrib/torch/nn/SpatialDilatedConvolution.lua b/contrib/lua-torch/nn/SpatialDilatedConvolution.lua similarity index 100% rename from contrib/torch/nn/SpatialDilatedConvolution.lua rename to contrib/lua-torch/nn/SpatialDilatedConvolution.lua diff --git a/contrib/torch/nn/SpatialDilatedMaxPooling.lua b/contrib/lua-torch/nn/SpatialDilatedMaxPooling.lua similarity index 100% rename from contrib/torch/nn/SpatialDilatedMaxPooling.lua rename to contrib/lua-torch/nn/SpatialDilatedMaxPooling.lua diff --git a/contrib/torch/nn/SpatialDivisiveNormalization.lua b/contrib/lua-torch/nn/SpatialDivisiveNormalization.lua similarity index 100% rename from contrib/torch/nn/SpatialDivisiveNormalization.lua rename to contrib/lua-torch/nn/SpatialDivisiveNormalization.lua diff --git a/contrib/torch/nn/SpatialDropout.lua b/contrib/lua-torch/nn/SpatialDropout.lua similarity index 100% rename from contrib/torch/nn/SpatialDropout.lua rename to contrib/lua-torch/nn/SpatialDropout.lua diff --git a/contrib/torch/nn/SpatialFractionalMaxPooling.lua b/contrib/lua-torch/nn/SpatialFractionalMaxPooling.lua similarity index 100% rename from contrib/torch/nn/SpatialFractionalMaxPooling.lua rename to contrib/lua-torch/nn/SpatialFractionalMaxPooling.lua diff --git a/contrib/torch/nn/SpatialFullConvolution.lua b/contrib/lua-torch/nn/SpatialFullConvolution.lua similarity index 100% rename from contrib/torch/nn/SpatialFullConvolution.lua rename to contrib/lua-torch/nn/SpatialFullConvolution.lua diff --git a/contrib/torch/nn/SpatialFullConvolutionMap.lua b/contrib/lua-torch/nn/SpatialFullConvolutionMap.lua similarity index 100% rename from contrib/torch/nn/SpatialFullConvolutionMap.lua rename to contrib/lua-torch/nn/SpatialFullConvolutionMap.lua diff --git a/contrib/torch/nn/SpatialLPPooling.lua b/contrib/lua-torch/nn/SpatialLPPooling.lua similarity index 100% rename from contrib/torch/nn/SpatialLPPooling.lua rename to contrib/lua-torch/nn/SpatialLPPooling.lua diff --git a/contrib/torch/nn/SpatialLogSoftMax.lua b/contrib/lua-torch/nn/SpatialLogSoftMax.lua similarity index 100% rename from contrib/torch/nn/SpatialLogSoftMax.lua rename to contrib/lua-torch/nn/SpatialLogSoftMax.lua diff --git a/contrib/torch/nn/SpatialMaxPooling.lua b/contrib/lua-torch/nn/SpatialMaxPooling.lua similarity index 100% rename from contrib/torch/nn/SpatialMaxPooling.lua rename to contrib/lua-torch/nn/SpatialMaxPooling.lua diff --git a/contrib/torch/nn/SpatialMaxUnpooling.lua b/contrib/lua-torch/nn/SpatialMaxUnpooling.lua similarity index 100% rename from contrib/torch/nn/SpatialMaxUnpooling.lua rename to contrib/lua-torch/nn/SpatialMaxUnpooling.lua diff --git a/contrib/torch/nn/SpatialReflectionPadding.lua b/contrib/lua-torch/nn/SpatialReflectionPadding.lua similarity index 100% rename from contrib/torch/nn/SpatialReflectionPadding.lua rename to contrib/lua-torch/nn/SpatialReflectionPadding.lua diff --git a/contrib/torch/nn/SpatialReplicationPadding.lua b/contrib/lua-torch/nn/SpatialReplicationPadding.lua similarity index 100% rename from contrib/torch/nn/SpatialReplicationPadding.lua rename to contrib/lua-torch/nn/SpatialReplicationPadding.lua diff --git a/contrib/torch/nn/SpatialSoftMax.lua b/contrib/lua-torch/nn/SpatialSoftMax.lua similarity index 100% rename from contrib/torch/nn/SpatialSoftMax.lua rename to contrib/lua-torch/nn/SpatialSoftMax.lua diff --git a/contrib/torch/nn/SpatialSubSampling.lua b/contrib/lua-torch/nn/SpatialSubSampling.lua similarity index 100% rename from contrib/torch/nn/SpatialSubSampling.lua rename to contrib/lua-torch/nn/SpatialSubSampling.lua diff --git a/contrib/torch/nn/SpatialSubtractiveNormalization.lua b/contrib/lua-torch/nn/SpatialSubtractiveNormalization.lua similarity index 100% rename from contrib/torch/nn/SpatialSubtractiveNormalization.lua rename to contrib/lua-torch/nn/SpatialSubtractiveNormalization.lua diff --git a/contrib/torch/nn/SpatialUpSamplingBilinear.lua b/contrib/lua-torch/nn/SpatialUpSamplingBilinear.lua similarity index 100% rename from contrib/torch/nn/SpatialUpSamplingBilinear.lua rename to contrib/lua-torch/nn/SpatialUpSamplingBilinear.lua diff --git a/contrib/torch/nn/SpatialUpSamplingNearest.lua b/contrib/lua-torch/nn/SpatialUpSamplingNearest.lua similarity index 100% rename from contrib/torch/nn/SpatialUpSamplingNearest.lua rename to contrib/lua-torch/nn/SpatialUpSamplingNearest.lua diff --git a/contrib/torch/nn/SpatialZeroPadding.lua b/contrib/lua-torch/nn/SpatialZeroPadding.lua similarity index 100% rename from contrib/torch/nn/SpatialZeroPadding.lua rename to contrib/lua-torch/nn/SpatialZeroPadding.lua diff --git a/contrib/torch/nn/SplitTable.lua b/contrib/lua-torch/nn/SplitTable.lua similarity index 100% rename from contrib/torch/nn/SplitTable.lua rename to contrib/lua-torch/nn/SplitTable.lua diff --git a/contrib/torch/nn/Sqrt.lua b/contrib/lua-torch/nn/Sqrt.lua similarity index 100% rename from contrib/torch/nn/Sqrt.lua rename to contrib/lua-torch/nn/Sqrt.lua diff --git a/contrib/torch/nn/Square.lua b/contrib/lua-torch/nn/Square.lua similarity index 100% rename from contrib/torch/nn/Square.lua rename to contrib/lua-torch/nn/Square.lua diff --git a/contrib/torch/nn/Squeeze.lua b/contrib/lua-torch/nn/Squeeze.lua similarity index 100% rename from contrib/torch/nn/Squeeze.lua rename to contrib/lua-torch/nn/Squeeze.lua diff --git a/contrib/torch/nn/StochasticGradient.lua b/contrib/lua-torch/nn/StochasticGradient.lua similarity index 100% rename from contrib/torch/nn/StochasticGradient.lua rename to contrib/lua-torch/nn/StochasticGradient.lua diff --git a/contrib/torch/nn/Sum.lua b/contrib/lua-torch/nn/Sum.lua similarity index 100% rename from contrib/torch/nn/Sum.lua rename to contrib/lua-torch/nn/Sum.lua diff --git a/contrib/torch/nn/THNN.lua b/contrib/lua-torch/nn/THNN.lua similarity index 100% rename from contrib/torch/nn/THNN.lua rename to contrib/lua-torch/nn/THNN.lua diff --git a/contrib/torch/nn/Tanh.lua b/contrib/lua-torch/nn/Tanh.lua similarity index 100% rename from contrib/torch/nn/Tanh.lua rename to contrib/lua-torch/nn/Tanh.lua diff --git a/contrib/torch/nn/TanhShrink.lua b/contrib/lua-torch/nn/TanhShrink.lua similarity index 100% rename from contrib/torch/nn/TanhShrink.lua rename to contrib/lua-torch/nn/TanhShrink.lua diff --git a/contrib/torch/nn/TemporalConvolution.lua b/contrib/lua-torch/nn/TemporalConvolution.lua similarity index 100% rename from contrib/torch/nn/TemporalConvolution.lua rename to contrib/lua-torch/nn/TemporalConvolution.lua diff --git a/contrib/torch/nn/TemporalDynamicKMaxPooling.lua b/contrib/lua-torch/nn/TemporalDynamicKMaxPooling.lua similarity index 100% rename from contrib/torch/nn/TemporalDynamicKMaxPooling.lua rename to contrib/lua-torch/nn/TemporalDynamicKMaxPooling.lua diff --git a/contrib/torch/nn/TemporalMaxPooling.lua b/contrib/lua-torch/nn/TemporalMaxPooling.lua similarity index 100% rename from contrib/torch/nn/TemporalMaxPooling.lua rename to contrib/lua-torch/nn/TemporalMaxPooling.lua diff --git a/contrib/torch/nn/TemporalRowConvolution.lua b/contrib/lua-torch/nn/TemporalRowConvolution.lua similarity index 100% rename from contrib/torch/nn/TemporalRowConvolution.lua rename to contrib/lua-torch/nn/TemporalRowConvolution.lua diff --git a/contrib/torch/nn/TemporalSubSampling.lua b/contrib/lua-torch/nn/TemporalSubSampling.lua similarity index 100% rename from contrib/torch/nn/TemporalSubSampling.lua rename to contrib/lua-torch/nn/TemporalSubSampling.lua diff --git a/contrib/torch/nn/Threshold.lua b/contrib/lua-torch/nn/Threshold.lua similarity index 100% rename from contrib/torch/nn/Threshold.lua rename to contrib/lua-torch/nn/Threshold.lua diff --git a/contrib/torch/nn/Transpose.lua b/contrib/lua-torch/nn/Transpose.lua similarity index 100% rename from contrib/torch/nn/Transpose.lua rename to contrib/lua-torch/nn/Transpose.lua diff --git a/contrib/torch/nn/Unsqueeze.lua b/contrib/lua-torch/nn/Unsqueeze.lua similarity index 100% rename from contrib/torch/nn/Unsqueeze.lua rename to contrib/lua-torch/nn/Unsqueeze.lua diff --git a/contrib/torch/nn/View.lua b/contrib/lua-torch/nn/View.lua similarity index 100% rename from contrib/torch/nn/View.lua rename to contrib/lua-torch/nn/View.lua diff --git a/contrib/torch/nn/VolumetricAveragePooling.lua b/contrib/lua-torch/nn/VolumetricAveragePooling.lua similarity index 100% rename from contrib/torch/nn/VolumetricAveragePooling.lua rename to contrib/lua-torch/nn/VolumetricAveragePooling.lua diff --git a/contrib/torch/nn/VolumetricBatchNormalization.lua b/contrib/lua-torch/nn/VolumetricBatchNormalization.lua similarity index 100% rename from contrib/torch/nn/VolumetricBatchNormalization.lua rename to contrib/lua-torch/nn/VolumetricBatchNormalization.lua diff --git a/contrib/torch/nn/VolumetricConvolution.lua b/contrib/lua-torch/nn/VolumetricConvolution.lua similarity index 100% rename from contrib/torch/nn/VolumetricConvolution.lua rename to contrib/lua-torch/nn/VolumetricConvolution.lua diff --git a/contrib/torch/nn/VolumetricDilatedConvolution.lua b/contrib/lua-torch/nn/VolumetricDilatedConvolution.lua similarity index 100% rename from contrib/torch/nn/VolumetricDilatedConvolution.lua rename to contrib/lua-torch/nn/VolumetricDilatedConvolution.lua diff --git a/contrib/torch/nn/VolumetricDilatedMaxPooling.lua b/contrib/lua-torch/nn/VolumetricDilatedMaxPooling.lua similarity index 100% rename from contrib/torch/nn/VolumetricDilatedMaxPooling.lua rename to contrib/lua-torch/nn/VolumetricDilatedMaxPooling.lua diff --git a/contrib/torch/nn/VolumetricDropout.lua b/contrib/lua-torch/nn/VolumetricDropout.lua similarity index 100% rename from contrib/torch/nn/VolumetricDropout.lua rename to contrib/lua-torch/nn/VolumetricDropout.lua diff --git a/contrib/torch/nn/VolumetricFractionalMaxPooling.lua b/contrib/lua-torch/nn/VolumetricFractionalMaxPooling.lua similarity index 100% rename from contrib/torch/nn/VolumetricFractionalMaxPooling.lua rename to contrib/lua-torch/nn/VolumetricFractionalMaxPooling.lua diff --git a/contrib/torch/nn/VolumetricFullConvolution.lua b/contrib/lua-torch/nn/VolumetricFullConvolution.lua similarity index 100% rename from contrib/torch/nn/VolumetricFullConvolution.lua rename to contrib/lua-torch/nn/VolumetricFullConvolution.lua diff --git a/contrib/torch/nn/VolumetricMaxPooling.lua b/contrib/lua-torch/nn/VolumetricMaxPooling.lua similarity index 100% rename from contrib/torch/nn/VolumetricMaxPooling.lua rename to contrib/lua-torch/nn/VolumetricMaxPooling.lua diff --git a/contrib/torch/nn/VolumetricMaxUnpooling.lua b/contrib/lua-torch/nn/VolumetricMaxUnpooling.lua similarity index 100% rename from contrib/torch/nn/VolumetricMaxUnpooling.lua rename to contrib/lua-torch/nn/VolumetricMaxUnpooling.lua diff --git a/contrib/torch/nn/VolumetricReplicationPadding.lua b/contrib/lua-torch/nn/VolumetricReplicationPadding.lua similarity index 100% rename from contrib/torch/nn/VolumetricReplicationPadding.lua rename to contrib/lua-torch/nn/VolumetricReplicationPadding.lua diff --git a/contrib/torch/nn/WeightNorm.lua b/contrib/lua-torch/nn/WeightNorm.lua similarity index 100% rename from contrib/torch/nn/WeightNorm.lua rename to contrib/lua-torch/nn/WeightNorm.lua diff --git a/contrib/torch/nn/WeightedEuclidean.lua b/contrib/lua-torch/nn/WeightedEuclidean.lua similarity index 100% rename from contrib/torch/nn/WeightedEuclidean.lua rename to contrib/lua-torch/nn/WeightedEuclidean.lua diff --git a/contrib/torch/nn/WeightedMSECriterion.lua b/contrib/lua-torch/nn/WeightedMSECriterion.lua similarity index 100% rename from contrib/torch/nn/WeightedMSECriterion.lua rename to contrib/lua-torch/nn/WeightedMSECriterion.lua diff --git a/contrib/torch/nn/WhiteNoise.lua b/contrib/lua-torch/nn/WhiteNoise.lua similarity index 100% rename from contrib/torch/nn/WhiteNoise.lua rename to contrib/lua-torch/nn/WhiteNoise.lua diff --git a/contrib/torch/nn/ZeroGrad.lua b/contrib/lua-torch/nn/ZeroGrad.lua similarity index 100% rename from contrib/torch/nn/ZeroGrad.lua rename to contrib/lua-torch/nn/ZeroGrad.lua diff --git a/contrib/torch/nn/ZipTable.lua b/contrib/lua-torch/nn/ZipTable.lua similarity index 100% rename from contrib/torch/nn/ZipTable.lua rename to contrib/lua-torch/nn/ZipTable.lua diff --git a/contrib/torch/nn/ZipTableOneToMany.lua b/contrib/lua-torch/nn/ZipTableOneToMany.lua similarity index 100% rename from contrib/torch/nn/ZipTableOneToMany.lua rename to contrib/lua-torch/nn/ZipTableOneToMany.lua diff --git a/contrib/torch/nn/hessian.lua b/contrib/lua-torch/nn/hessian.lua similarity index 100% rename from contrib/torch/nn/hessian.lua rename to contrib/lua-torch/nn/hessian.lua diff --git a/contrib/torch/nn/init.lua b/contrib/lua-torch/nn/init.lua similarity index 100% rename from contrib/torch/nn/init.lua rename to contrib/lua-torch/nn/init.lua diff --git a/contrib/torch/nn/lib/CMakeLists.txt b/contrib/lua-torch/nn/lib/CMakeLists.txt similarity index 100% rename from contrib/torch/nn/lib/CMakeLists.txt rename to contrib/lua-torch/nn/lib/CMakeLists.txt diff --git a/contrib/torch/nn/lib/THNN/CMakeLists.txt b/contrib/lua-torch/nn/lib/THNN/CMakeLists.txt similarity index 100% rename from contrib/torch/nn/lib/THNN/CMakeLists.txt rename to contrib/lua-torch/nn/lib/THNN/CMakeLists.txt diff --git a/contrib/torch/nn/lib/THNN/README.md b/contrib/lua-torch/nn/lib/THNN/README.md similarity index 100% rename from contrib/torch/nn/lib/THNN/README.md rename to contrib/lua-torch/nn/lib/THNN/README.md diff --git a/contrib/torch/nn/lib/THNN/THNN.h b/contrib/lua-torch/nn/lib/THNN/THNN.h similarity index 100% rename from contrib/torch/nn/lib/THNN/THNN.h rename to contrib/lua-torch/nn/lib/THNN/THNN.h diff --git a/contrib/torch/nn/lib/THNN/generic/Abs.c b/contrib/lua-torch/nn/lib/THNN/generic/Abs.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/Abs.c rename to contrib/lua-torch/nn/lib/THNN/generic/Abs.c diff --git a/contrib/torch/nn/lib/THNN/generic/AbsCriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/AbsCriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/AbsCriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/AbsCriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/BCECriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/BCECriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/BCECriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/BCECriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/BatchNormalization.c b/contrib/lua-torch/nn/lib/THNN/generic/BatchNormalization.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/BatchNormalization.c rename to contrib/lua-torch/nn/lib/THNN/generic/BatchNormalization.c diff --git a/contrib/torch/nn/lib/THNN/generic/ClassNLLCriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/ClassNLLCriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/ClassNLLCriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/ClassNLLCriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/DistKLDivCriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/DistKLDivCriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/DistKLDivCriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/DistKLDivCriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/ELU.c b/contrib/lua-torch/nn/lib/THNN/generic/ELU.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/ELU.c rename to contrib/lua-torch/nn/lib/THNN/generic/ELU.c diff --git a/contrib/torch/nn/lib/THNN/generic/FusedRNNKernel.c b/contrib/lua-torch/nn/lib/THNN/generic/FusedRNNKernel.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/FusedRNNKernel.c rename to contrib/lua-torch/nn/lib/THNN/generic/FusedRNNKernel.c diff --git a/contrib/torch/nn/lib/THNN/generic/GatedLinearUnit.c b/contrib/lua-torch/nn/lib/THNN/generic/GatedLinearUnit.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/GatedLinearUnit.c rename to contrib/lua-torch/nn/lib/THNN/generic/GatedLinearUnit.c diff --git a/contrib/torch/nn/lib/THNN/generic/HardShrink.c b/contrib/lua-torch/nn/lib/THNN/generic/HardShrink.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/HardShrink.c rename to contrib/lua-torch/nn/lib/THNN/generic/HardShrink.c diff --git a/contrib/torch/nn/lib/THNN/generic/HardTanh.c b/contrib/lua-torch/nn/lib/THNN/generic/HardTanh.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/HardTanh.c rename to contrib/lua-torch/nn/lib/THNN/generic/HardTanh.c diff --git a/contrib/torch/nn/lib/THNN/generic/IndexLinear.c b/contrib/lua-torch/nn/lib/THNN/generic/IndexLinear.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/IndexLinear.c rename to contrib/lua-torch/nn/lib/THNN/generic/IndexLinear.c diff --git a/contrib/torch/nn/lib/THNN/generic/L1Cost.c b/contrib/lua-torch/nn/lib/THNN/generic/L1Cost.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/L1Cost.c rename to contrib/lua-torch/nn/lib/THNN/generic/L1Cost.c diff --git a/contrib/torch/nn/lib/THNN/generic/LeakyReLU.c b/contrib/lua-torch/nn/lib/THNN/generic/LeakyReLU.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/LeakyReLU.c rename to contrib/lua-torch/nn/lib/THNN/generic/LeakyReLU.c diff --git a/contrib/torch/nn/lib/THNN/generic/Linear.c b/contrib/lua-torch/nn/lib/THNN/generic/Linear.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/Linear.c rename to contrib/lua-torch/nn/lib/THNN/generic/Linear.c diff --git a/contrib/torch/nn/lib/THNN/generic/LogSigmoid.c b/contrib/lua-torch/nn/lib/THNN/generic/LogSigmoid.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/LogSigmoid.c rename to contrib/lua-torch/nn/lib/THNN/generic/LogSigmoid.c diff --git a/contrib/torch/nn/lib/THNN/generic/LogSoftMax.c b/contrib/lua-torch/nn/lib/THNN/generic/LogSoftMax.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/LogSoftMax.c rename to contrib/lua-torch/nn/lib/THNN/generic/LogSoftMax.c diff --git a/contrib/torch/nn/lib/THNN/generic/LookupTable.c b/contrib/lua-torch/nn/lib/THNN/generic/LookupTable.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/LookupTable.c rename to contrib/lua-torch/nn/lib/THNN/generic/LookupTable.c diff --git a/contrib/torch/nn/lib/THNN/generic/MSECriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/MSECriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/MSECriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/MSECriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/MarginCriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/MarginCriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/MarginCriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/MarginCriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/MultiLabelMarginCriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/MultiLabelMarginCriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/MultiLabelMarginCriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/MultiLabelMarginCriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/MultiMarginCriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/MultiMarginCriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/MultiMarginCriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/MultiMarginCriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/PReLU.c b/contrib/lua-torch/nn/lib/THNN/generic/PReLU.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/PReLU.c rename to contrib/lua-torch/nn/lib/THNN/generic/PReLU.c diff --git a/contrib/torch/nn/lib/THNN/generic/RReLU.c b/contrib/lua-torch/nn/lib/THNN/generic/RReLU.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/RReLU.c rename to contrib/lua-torch/nn/lib/THNN/generic/RReLU.c diff --git a/contrib/torch/nn/lib/THNN/generic/Sigmoid.c b/contrib/lua-torch/nn/lib/THNN/generic/Sigmoid.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/Sigmoid.c rename to contrib/lua-torch/nn/lib/THNN/generic/Sigmoid.c diff --git a/contrib/torch/nn/lib/THNN/generic/SmoothL1Criterion.c b/contrib/lua-torch/nn/lib/THNN/generic/SmoothL1Criterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SmoothL1Criterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/SmoothL1Criterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/SoftMarginCriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/SoftMarginCriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SoftMarginCriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/SoftMarginCriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/SoftMax.c b/contrib/lua-torch/nn/lib/THNN/generic/SoftMax.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SoftMax.c rename to contrib/lua-torch/nn/lib/THNN/generic/SoftMax.c diff --git a/contrib/torch/nn/lib/THNN/generic/SoftPlus.c b/contrib/lua-torch/nn/lib/THNN/generic/SoftPlus.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SoftPlus.c rename to contrib/lua-torch/nn/lib/THNN/generic/SoftPlus.c diff --git a/contrib/torch/nn/lib/THNN/generic/SoftShrink.c b/contrib/lua-torch/nn/lib/THNN/generic/SoftShrink.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SoftShrink.c rename to contrib/lua-torch/nn/lib/THNN/generic/SoftShrink.c diff --git a/contrib/torch/nn/lib/THNN/generic/SparseLinear.c b/contrib/lua-torch/nn/lib/THNN/generic/SparseLinear.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SparseLinear.c rename to contrib/lua-torch/nn/lib/THNN/generic/SparseLinear.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialAdaptiveAveragePooling.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialAdaptiveAveragePooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialAdaptiveAveragePooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialAdaptiveAveragePooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialAdaptiveMaxPooling.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialAdaptiveMaxPooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialAdaptiveMaxPooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialAdaptiveMaxPooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialAveragePooling.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialAveragePooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialAveragePooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialAveragePooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialClassNLLCriterion.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialClassNLLCriterion.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialClassNLLCriterion.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialClassNLLCriterion.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialConvolutionLocal.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialConvolutionLocal.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialConvolutionLocal.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialConvolutionLocal.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialConvolutionMM.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialConvolutionMM.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialConvolutionMM.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialConvolutionMM.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialConvolutionMap.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialConvolutionMap.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialConvolutionMap.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialConvolutionMap.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialDepthWiseConvolution.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialDepthWiseConvolution.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialDepthWiseConvolution.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialDepthWiseConvolution.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialDilatedConvolution.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialDilatedConvolution.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialDilatedConvolution.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialDilatedConvolution.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialDilatedMaxPooling.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialDilatedMaxPooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialDilatedMaxPooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialDilatedMaxPooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialFractionalMaxPooling.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialFractionalMaxPooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialFractionalMaxPooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialFractionalMaxPooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialFullConvolution.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialFullConvolution.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialFullConvolution.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialFullConvolution.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialFullConvolutionMap.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialFullConvolutionMap.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialFullConvolutionMap.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialFullConvolutionMap.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialMaxPooling.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialMaxPooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialMaxPooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialMaxPooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialMaxUnpooling.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialMaxUnpooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialMaxUnpooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialMaxUnpooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialReflectionPadding.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialReflectionPadding.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialReflectionPadding.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialReflectionPadding.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialReplicationPadding.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialReplicationPadding.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialReplicationPadding.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialReplicationPadding.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialSubSampling.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialSubSampling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialSubSampling.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialSubSampling.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialUpSamplingBilinear.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialUpSamplingBilinear.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialUpSamplingBilinear.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialUpSamplingBilinear.c diff --git a/contrib/torch/nn/lib/THNN/generic/SpatialUpSamplingNearest.c b/contrib/lua-torch/nn/lib/THNN/generic/SpatialUpSamplingNearest.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/SpatialUpSamplingNearest.c rename to contrib/lua-torch/nn/lib/THNN/generic/SpatialUpSamplingNearest.c diff --git a/contrib/torch/nn/lib/THNN/generic/Sqrt.c b/contrib/lua-torch/nn/lib/THNN/generic/Sqrt.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/Sqrt.c rename to contrib/lua-torch/nn/lib/THNN/generic/Sqrt.c diff --git a/contrib/torch/nn/lib/THNN/generic/Square.c b/contrib/lua-torch/nn/lib/THNN/generic/Square.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/Square.c rename to contrib/lua-torch/nn/lib/THNN/generic/Square.c diff --git a/contrib/torch/nn/lib/THNN/generic/THNN.h b/contrib/lua-torch/nn/lib/THNN/generic/THNN.h similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/THNN.h rename to contrib/lua-torch/nn/lib/THNN/generic/THNN.h diff --git a/contrib/torch/nn/lib/THNN/generic/Tanh.c b/contrib/lua-torch/nn/lib/THNN/generic/Tanh.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/Tanh.c rename to contrib/lua-torch/nn/lib/THNN/generic/Tanh.c diff --git a/contrib/torch/nn/lib/THNN/generic/TemporalConvolution.c b/contrib/lua-torch/nn/lib/THNN/generic/TemporalConvolution.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/TemporalConvolution.c rename to contrib/lua-torch/nn/lib/THNN/generic/TemporalConvolution.c diff --git a/contrib/torch/nn/lib/THNN/generic/TemporalMaxPooling.c b/contrib/lua-torch/nn/lib/THNN/generic/TemporalMaxPooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/TemporalMaxPooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/TemporalMaxPooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/TemporalRowConvolution.c b/contrib/lua-torch/nn/lib/THNN/generic/TemporalRowConvolution.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/TemporalRowConvolution.c rename to contrib/lua-torch/nn/lib/THNN/generic/TemporalRowConvolution.c diff --git a/contrib/torch/nn/lib/THNN/generic/TemporalSubSampling.c b/contrib/lua-torch/nn/lib/THNN/generic/TemporalSubSampling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/TemporalSubSampling.c rename to contrib/lua-torch/nn/lib/THNN/generic/TemporalSubSampling.c diff --git a/contrib/torch/nn/lib/THNN/generic/Threshold.c b/contrib/lua-torch/nn/lib/THNN/generic/Threshold.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/Threshold.c rename to contrib/lua-torch/nn/lib/THNN/generic/Threshold.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricAveragePooling.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricAveragePooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricAveragePooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricAveragePooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricConvolution.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricConvolution.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricConvolution.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricConvolution.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricConvolutionMM.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricConvolutionMM.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricConvolutionMM.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricConvolutionMM.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricDilatedConvolution.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricDilatedConvolution.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricDilatedConvolution.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricDilatedConvolution.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricDilatedMaxPooling.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricDilatedMaxPooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricDilatedMaxPooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricDilatedMaxPooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricFractionalMaxPooling.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricFractionalMaxPooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricFractionalMaxPooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricFractionalMaxPooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricFullConvolution.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricFullConvolution.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricFullConvolution.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricFullConvolution.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricMaxPooling.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricMaxPooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricMaxPooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricMaxPooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricMaxUnpooling.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricMaxUnpooling.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricMaxUnpooling.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricMaxUnpooling.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricReplicationPadding.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricReplicationPadding.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricReplicationPadding.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricReplicationPadding.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricUpSamplingNearest.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricUpSamplingNearest.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricUpSamplingNearest.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricUpSamplingNearest.c diff --git a/contrib/torch/nn/lib/THNN/generic/VolumetricUpSamplingTrilinear.c b/contrib/lua-torch/nn/lib/THNN/generic/VolumetricUpSamplingTrilinear.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/VolumetricUpSamplingTrilinear.c rename to contrib/lua-torch/nn/lib/THNN/generic/VolumetricUpSamplingTrilinear.c diff --git a/contrib/torch/nn/lib/THNN/generic/unfold.c b/contrib/lua-torch/nn/lib/THNN/generic/unfold.c similarity index 100% rename from contrib/torch/nn/lib/THNN/generic/unfold.c rename to contrib/lua-torch/nn/lib/THNN/generic/unfold.c diff --git a/contrib/torch/nn/lib/THNN/init.c b/contrib/lua-torch/nn/lib/THNN/init.c similarity index 100% rename from contrib/torch/nn/lib/THNN/init.c rename to contrib/lua-torch/nn/lib/THNN/init.c diff --git a/contrib/torch/nn/mkdocs.yml b/contrib/lua-torch/nn/mkdocs.yml similarity index 100% rename from contrib/torch/nn/mkdocs.yml rename to contrib/lua-torch/nn/mkdocs.yml diff --git a/contrib/torch/nn/test.lua b/contrib/lua-torch/nn/test.lua similarity index 100% rename from contrib/torch/nn/test.lua rename to contrib/lua-torch/nn/test.lua diff --git a/contrib/torch/nn/utils.lua b/contrib/lua-torch/nn/utils.lua similarity index 100% rename from contrib/torch/nn/utils.lua rename to contrib/lua-torch/nn/utils.lua diff --git a/contrib/torch/optim/CMakeLists.txt b/contrib/lua-torch/optim/CMakeLists.txt similarity index 100% rename from contrib/torch/optim/CMakeLists.txt rename to contrib/lua-torch/optim/CMakeLists.txt diff --git a/contrib/torch/optim/COPYRIGHT.txt b/contrib/lua-torch/optim/COPYRIGHT.txt similarity index 100% rename from contrib/torch/optim/COPYRIGHT.txt rename to contrib/lua-torch/optim/COPYRIGHT.txt diff --git a/contrib/torch/optim/ConfusionMatrix.lua b/contrib/lua-torch/optim/ConfusionMatrix.lua similarity index 100% rename from contrib/torch/optim/ConfusionMatrix.lua rename to contrib/lua-torch/optim/ConfusionMatrix.lua diff --git a/contrib/torch/optim/Logger.lua b/contrib/lua-torch/optim/Logger.lua similarity index 100% rename from contrib/torch/optim/Logger.lua rename to contrib/lua-torch/optim/Logger.lua diff --git a/contrib/torch/optim/adadelta.lua b/contrib/lua-torch/optim/adadelta.lua similarity index 100% rename from contrib/torch/optim/adadelta.lua rename to contrib/lua-torch/optim/adadelta.lua diff --git a/contrib/torch/optim/adagrad.lua b/contrib/lua-torch/optim/adagrad.lua similarity index 100% rename from contrib/torch/optim/adagrad.lua rename to contrib/lua-torch/optim/adagrad.lua diff --git a/contrib/torch/optim/adam.lua b/contrib/lua-torch/optim/adam.lua similarity index 100% rename from contrib/torch/optim/adam.lua rename to contrib/lua-torch/optim/adam.lua diff --git a/contrib/torch/optim/adamax.lua b/contrib/lua-torch/optim/adamax.lua similarity index 100% rename from contrib/torch/optim/adamax.lua rename to contrib/lua-torch/optim/adamax.lua diff --git a/contrib/torch/optim/asgd.lua b/contrib/lua-torch/optim/asgd.lua similarity index 100% rename from contrib/torch/optim/asgd.lua rename to contrib/lua-torch/optim/asgd.lua diff --git a/contrib/torch/optim/cg.lua b/contrib/lua-torch/optim/cg.lua similarity index 100% rename from contrib/torch/optim/cg.lua rename to contrib/lua-torch/optim/cg.lua diff --git a/contrib/torch/optim/checkgrad.lua b/contrib/lua-torch/optim/checkgrad.lua similarity index 100% rename from contrib/torch/optim/checkgrad.lua rename to contrib/lua-torch/optim/checkgrad.lua diff --git a/contrib/torch/optim/cmaes.lua b/contrib/lua-torch/optim/cmaes.lua similarity index 100% rename from contrib/torch/optim/cmaes.lua rename to contrib/lua-torch/optim/cmaes.lua diff --git a/contrib/torch/optim/de.lua b/contrib/lua-torch/optim/de.lua similarity index 100% rename from contrib/torch/optim/de.lua rename to contrib/lua-torch/optim/de.lua diff --git a/contrib/torch/optim/fista.lua b/contrib/lua-torch/optim/fista.lua similarity index 100% rename from contrib/torch/optim/fista.lua rename to contrib/lua-torch/optim/fista.lua diff --git a/contrib/torch/optim/init.lua b/contrib/lua-torch/optim/init.lua similarity index 100% rename from contrib/torch/optim/init.lua rename to contrib/lua-torch/optim/init.lua diff --git a/contrib/torch/optim/lbfgs.lua b/contrib/lua-torch/optim/lbfgs.lua similarity index 100% rename from contrib/torch/optim/lbfgs.lua rename to contrib/lua-torch/optim/lbfgs.lua diff --git a/contrib/torch/optim/lswolfe.lua b/contrib/lua-torch/optim/lswolfe.lua similarity index 100% rename from contrib/torch/optim/lswolfe.lua rename to contrib/lua-torch/optim/lswolfe.lua diff --git a/contrib/torch/optim/nag.lua b/contrib/lua-torch/optim/nag.lua similarity index 100% rename from contrib/torch/optim/nag.lua rename to contrib/lua-torch/optim/nag.lua diff --git a/contrib/torch/optim/polyinterp.lua b/contrib/lua-torch/optim/polyinterp.lua similarity index 100% rename from contrib/torch/optim/polyinterp.lua rename to contrib/lua-torch/optim/polyinterp.lua diff --git a/contrib/torch/optim/rmsprop.lua b/contrib/lua-torch/optim/rmsprop.lua similarity index 100% rename from contrib/torch/optim/rmsprop.lua rename to contrib/lua-torch/optim/rmsprop.lua diff --git a/contrib/torch/optim/rprop.lua b/contrib/lua-torch/optim/rprop.lua similarity index 100% rename from contrib/torch/optim/rprop.lua rename to contrib/lua-torch/optim/rprop.lua diff --git a/contrib/torch/optim/sgd.lua b/contrib/lua-torch/optim/sgd.lua similarity index 100% rename from contrib/torch/optim/sgd.lua rename to contrib/lua-torch/optim/sgd.lua diff --git a/contrib/torch/paths/CMakeLists.txt b/contrib/lua-torch/paths/CMakeLists.txt similarity index 100% rename from contrib/torch/paths/CMakeLists.txt rename to contrib/lua-torch/paths/CMakeLists.txt diff --git a/contrib/torch/paths/COPYRIGHT.txt b/contrib/lua-torch/paths/COPYRIGHT.txt similarity index 100% rename from contrib/torch/paths/COPYRIGHT.txt rename to contrib/lua-torch/paths/COPYRIGHT.txt diff --git a/contrib/torch/paths/README.md b/contrib/lua-torch/paths/README.md similarity index 100% rename from contrib/torch/paths/README.md rename to contrib/lua-torch/paths/README.md diff --git a/contrib/torch/paths/init.lua b/contrib/lua-torch/paths/init.lua similarity index 100% rename from contrib/torch/paths/init.lua rename to contrib/lua-torch/paths/init.lua diff --git a/contrib/torch/paths/mkdocs.yml b/contrib/lua-torch/paths/mkdocs.yml similarity index 100% rename from contrib/torch/paths/mkdocs.yml rename to contrib/lua-torch/paths/mkdocs.yml diff --git a/contrib/torch/paths/paths.c b/contrib/lua-torch/paths/paths.c similarity index 100% rename from contrib/torch/paths/paths.c rename to contrib/lua-torch/paths/paths.c diff --git a/contrib/torch/paths/paths.h.in b/contrib/lua-torch/paths/paths.h.in similarity index 100% rename from contrib/torch/paths/paths.h.in rename to contrib/lua-torch/paths/paths.h.in diff --git a/contrib/torch/torch7/CMakeLists.txt b/contrib/lua-torch/torch7/CMakeLists.txt similarity index 100% rename from contrib/torch/torch7/CMakeLists.txt rename to contrib/lua-torch/torch7/CMakeLists.txt diff --git a/contrib/torch/torch7/COPYRIGHT.txt b/contrib/lua-torch/torch7/COPYRIGHT.txt similarity index 100% rename from contrib/torch/torch7/COPYRIGHT.txt rename to contrib/lua-torch/torch7/COPYRIGHT.txt diff --git a/contrib/torch/torch7/CmdLine.lua b/contrib/lua-torch/torch7/CmdLine.lua similarity index 100% rename from contrib/torch/torch7/CmdLine.lua rename to contrib/lua-torch/torch7/CmdLine.lua diff --git a/contrib/torch/torch7/DiskFile.c b/contrib/lua-torch/torch7/DiskFile.c similarity index 100% rename from contrib/torch/torch7/DiskFile.c rename to contrib/lua-torch/torch7/DiskFile.c diff --git a/contrib/torch/torch7/FFInterface.lua b/contrib/lua-torch/torch7/FFInterface.lua similarity index 100% rename from contrib/torch/torch7/FFInterface.lua rename to contrib/lua-torch/torch7/FFInterface.lua diff --git a/contrib/torch/torch7/File.c b/contrib/lua-torch/torch7/File.c similarity index 100% rename from contrib/torch/torch7/File.c rename to contrib/lua-torch/torch7/File.c diff --git a/contrib/torch/torch7/File.lua b/contrib/lua-torch/torch7/File.lua similarity index 100% rename from contrib/torch/torch7/File.lua rename to contrib/lua-torch/torch7/File.lua diff --git a/contrib/torch/torch7/Generator.c b/contrib/lua-torch/torch7/Generator.c similarity index 100% rename from contrib/torch/torch7/Generator.c rename to contrib/lua-torch/torch7/Generator.c diff --git a/contrib/torch/torch7/MemoryFile.c b/contrib/lua-torch/torch7/MemoryFile.c similarity index 100% rename from contrib/torch/torch7/MemoryFile.c rename to contrib/lua-torch/torch7/MemoryFile.c diff --git a/contrib/torch/torch7/PipeFile.c b/contrib/lua-torch/torch7/PipeFile.c similarity index 100% rename from contrib/torch/torch7/PipeFile.c rename to contrib/lua-torch/torch7/PipeFile.c diff --git a/contrib/torch/torch7/README.md b/contrib/lua-torch/torch7/README.md similarity index 100% rename from contrib/torch/torch7/README.md rename to contrib/lua-torch/torch7/README.md diff --git a/contrib/torch/torch7/ROADMAP.md b/contrib/lua-torch/torch7/ROADMAP.md similarity index 100% rename from contrib/torch/torch7/ROADMAP.md rename to contrib/lua-torch/torch7/ROADMAP.md diff --git a/contrib/torch/torch7/Storage.c b/contrib/lua-torch/torch7/Storage.c similarity index 100% rename from contrib/torch/torch7/Storage.c rename to contrib/lua-torch/torch7/Storage.c diff --git a/contrib/torch/torch7/Tensor.c b/contrib/lua-torch/torch7/Tensor.c similarity index 100% rename from contrib/torch/torch7/Tensor.c rename to contrib/lua-torch/torch7/Tensor.c diff --git a/contrib/torch/torch7/Tensor.lua b/contrib/lua-torch/torch7/Tensor.lua similarity index 100% rename from contrib/torch/torch7/Tensor.lua rename to contrib/lua-torch/torch7/Tensor.lua diff --git a/contrib/torch/torch7/TensorMath.c b/contrib/lua-torch/torch7/TensorMath.c similarity index 100% rename from contrib/torch/torch7/TensorMath.c rename to contrib/lua-torch/torch7/TensorMath.c diff --git a/contrib/torch/torch7/TensorMath.lua b/contrib/lua-torch/torch7/TensorMath.lua similarity index 100% rename from contrib/torch/torch7/TensorMath.lua rename to contrib/lua-torch/torch7/TensorMath.lua diff --git a/contrib/torch/torch7/TensorOperator.c b/contrib/lua-torch/torch7/TensorOperator.c similarity index 100% rename from contrib/torch/torch7/TensorOperator.c rename to contrib/lua-torch/torch7/TensorOperator.c diff --git a/contrib/torch/torch7/TestSuite.lua b/contrib/lua-torch/torch7/TestSuite.lua similarity index 100% rename from contrib/torch/torch7/TestSuite.lua rename to contrib/lua-torch/torch7/TestSuite.lua diff --git a/contrib/torch/torch7/Tester.lua b/contrib/lua-torch/torch7/Tester.lua similarity index 100% rename from contrib/torch/torch7/Tester.lua rename to contrib/lua-torch/torch7/Tester.lua diff --git a/contrib/torch/torch7/Timer.c b/contrib/lua-torch/torch7/Timer.c similarity index 100% rename from contrib/torch/torch7/Timer.c rename to contrib/lua-torch/torch7/Timer.c diff --git a/contrib/torch/torch7/cmake/TorchConfig.cmake.in b/contrib/lua-torch/torch7/cmake/TorchConfig.cmake.in similarity index 100% rename from contrib/torch/torch7/cmake/TorchConfig.cmake.in rename to contrib/lua-torch/torch7/cmake/TorchConfig.cmake.in diff --git a/contrib/torch/torch7/cmake/TorchExports.cmake b/contrib/lua-torch/torch7/cmake/TorchExports.cmake similarity index 100% rename from contrib/torch/torch7/cmake/TorchExports.cmake rename to contrib/lua-torch/torch7/cmake/TorchExports.cmake diff --git a/contrib/torch/torch7/cmake/TorchPackage.cmake b/contrib/lua-torch/torch7/cmake/TorchPackage.cmake similarity index 84% rename from contrib/torch/torch7/cmake/TorchPackage.cmake rename to contrib/lua-torch/torch7/cmake/TorchPackage.cmake index 9ffdcf788a..846b263a41 100644 --- a/contrib/torch/torch7/cmake/TorchPackage.cmake +++ b/contrib/lua-torch/torch7/cmake/TorchPackage.cmake @@ -19,10 +19,10 @@ ENDMACRO() MACRO(ADD_TORCH_PACKAGE package src luasrc) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/contrib/torch/torch7/lib/TH) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/contrib/torch/torch7/lib/luaT) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/contrib/torch/torch7/lib/TH) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/contrib/torch/torch7/lib/luaT) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/contrib/lua-torch/torch7/lib/TH) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/contrib/lua-torch/torch7/lib/luaT) + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/contrib/lua-torch/torch7/lib/TH) + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/contrib/lua-torch/torch7/lib/luaT) INCLUDE_DIRECTORIES(${Torch_LUA_INCLUDE_DIR}) ### C/C++ sources diff --git a/contrib/torch/torch7/cmake/TorchPaths.cmake b/contrib/lua-torch/torch7/cmake/TorchPaths.cmake similarity index 100% rename from contrib/torch/torch7/cmake/TorchPaths.cmake rename to contrib/lua-torch/torch7/cmake/TorchPaths.cmake diff --git a/contrib/torch/torch7/cmake/TorchPathsInit.cmake b/contrib/lua-torch/torch7/cmake/TorchPathsInit.cmake similarity index 100% rename from contrib/torch/torch7/cmake/TorchPathsInit.cmake rename to contrib/lua-torch/torch7/cmake/TorchPathsInit.cmake diff --git a/contrib/torch/torch7/cmake/TorchWrap.cmake b/contrib/lua-torch/torch7/cmake/TorchWrap.cmake similarity index 100% rename from contrib/torch/torch7/cmake/TorchWrap.cmake rename to contrib/lua-torch/torch7/cmake/TorchWrap.cmake diff --git a/contrib/torch/torch7/cmake/TorchWrap.cmake.in b/contrib/lua-torch/torch7/cmake/TorchWrap.cmake.in similarity index 100% rename from contrib/torch/torch7/cmake/TorchWrap.cmake.in rename to contrib/lua-torch/torch7/cmake/TorchWrap.cmake.in diff --git a/contrib/torch/torch7/general.h b/contrib/lua-torch/torch7/general.h similarity index 100% rename from contrib/torch/torch7/general.h rename to contrib/lua-torch/torch7/general.h diff --git a/contrib/torch/torch7/generic/Storage.c b/contrib/lua-torch/torch7/generic/Storage.c similarity index 100% rename from contrib/torch/torch7/generic/Storage.c rename to contrib/lua-torch/torch7/generic/Storage.c diff --git a/contrib/torch/torch7/generic/Tensor.c b/contrib/lua-torch/torch7/generic/Tensor.c similarity index 100% rename from contrib/torch/torch7/generic/Tensor.c rename to contrib/lua-torch/torch7/generic/Tensor.c diff --git a/contrib/torch/torch7/generic/TensorOperator.c b/contrib/lua-torch/torch7/generic/TensorOperator.c similarity index 100% rename from contrib/torch/torch7/generic/TensorOperator.c rename to contrib/lua-torch/torch7/generic/TensorOperator.c diff --git a/contrib/torch/torch7/generic/luaG.h b/contrib/lua-torch/torch7/generic/luaG.h similarity index 100% rename from contrib/torch/torch7/generic/luaG.h rename to contrib/lua-torch/torch7/generic/luaG.h diff --git a/contrib/torch/torch7/init.c b/contrib/lua-torch/torch7/init.c similarity index 100% rename from contrib/torch/torch7/init.c rename to contrib/lua-torch/torch7/init.c diff --git a/contrib/torch/torch7/init.lua b/contrib/lua-torch/torch7/init.lua similarity index 100% rename from contrib/torch/torch7/init.lua rename to contrib/lua-torch/torch7/init.lua diff --git a/contrib/torch/torch7/lib/CMakeLists.txt b/contrib/lua-torch/torch7/lib/CMakeLists.txt similarity index 100% rename from contrib/torch/torch7/lib/CMakeLists.txt rename to contrib/lua-torch/torch7/lib/CMakeLists.txt diff --git a/contrib/torch/torch7/lib/TH/CMakeLists.txt b/contrib/lua-torch/torch7/lib/TH/CMakeLists.txt similarity index 100% rename from contrib/torch/torch7/lib/TH/CMakeLists.txt rename to contrib/lua-torch/torch7/lib/TH/CMakeLists.txt diff --git a/contrib/torch/torch7/lib/TH/README.md b/contrib/lua-torch/torch7/lib/TH/README.md similarity index 100% rename from contrib/torch/torch7/lib/TH/README.md rename to contrib/lua-torch/torch7/lib/TH/README.md diff --git a/contrib/torch/torch7/lib/TH/TH.h b/contrib/lua-torch/torch7/lib/TH/TH.h similarity index 100% rename from contrib/torch/torch7/lib/TH/TH.h rename to contrib/lua-torch/torch7/lib/TH/TH.h diff --git a/contrib/torch/torch7/lib/TH/THAllocator.c b/contrib/lua-torch/torch7/lib/TH/THAllocator.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THAllocator.c rename to contrib/lua-torch/torch7/lib/TH/THAllocator.c diff --git a/contrib/torch/torch7/lib/TH/THAllocator.h b/contrib/lua-torch/torch7/lib/TH/THAllocator.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THAllocator.h rename to contrib/lua-torch/torch7/lib/TH/THAllocator.h diff --git a/contrib/torch/torch7/lib/TH/THAtomic.c b/contrib/lua-torch/torch7/lib/TH/THAtomic.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THAtomic.c rename to contrib/lua-torch/torch7/lib/TH/THAtomic.c diff --git a/contrib/torch/torch7/lib/TH/THAtomic.h b/contrib/lua-torch/torch7/lib/TH/THAtomic.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THAtomic.h rename to contrib/lua-torch/torch7/lib/TH/THAtomic.h diff --git a/contrib/torch/torch7/lib/TH/THBlas.c b/contrib/lua-torch/torch7/lib/TH/THBlas.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THBlas.c rename to contrib/lua-torch/torch7/lib/TH/THBlas.c diff --git a/contrib/torch/torch7/lib/TH/THBlas.h b/contrib/lua-torch/torch7/lib/TH/THBlas.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THBlas.h rename to contrib/lua-torch/torch7/lib/TH/THBlas.h diff --git a/contrib/torch/torch7/lib/TH/THConfig.cmake.in b/contrib/lua-torch/torch7/lib/TH/THConfig.cmake.in similarity index 100% rename from contrib/torch/torch7/lib/TH/THConfig.cmake.in rename to contrib/lua-torch/torch7/lib/TH/THConfig.cmake.in diff --git a/contrib/torch/torch7/lib/TH/THDiskFile.c b/contrib/lua-torch/torch7/lib/TH/THDiskFile.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THDiskFile.c rename to contrib/lua-torch/torch7/lib/TH/THDiskFile.c diff --git a/contrib/torch/torch7/lib/TH/THDiskFile.h b/contrib/lua-torch/torch7/lib/TH/THDiskFile.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THDiskFile.h rename to contrib/lua-torch/torch7/lib/TH/THDiskFile.h diff --git a/contrib/torch/torch7/lib/TH/THFile.c b/contrib/lua-torch/torch7/lib/TH/THFile.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THFile.c rename to contrib/lua-torch/torch7/lib/TH/THFile.c diff --git a/contrib/torch/torch7/lib/TH/THFile.h b/contrib/lua-torch/torch7/lib/TH/THFile.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THFile.h rename to contrib/lua-torch/torch7/lib/TH/THFile.h diff --git a/contrib/torch/torch7/lib/TH/THFilePrivate.h b/contrib/lua-torch/torch7/lib/TH/THFilePrivate.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THFilePrivate.h rename to contrib/lua-torch/torch7/lib/TH/THFilePrivate.h diff --git a/contrib/torch/torch7/lib/TH/THGeneral.c b/contrib/lua-torch/torch7/lib/TH/THGeneral.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THGeneral.c rename to contrib/lua-torch/torch7/lib/TH/THGeneral.c diff --git a/contrib/torch/torch7/lib/TH/THGeneral.h.in b/contrib/lua-torch/torch7/lib/TH/THGeneral.h.in similarity index 100% rename from contrib/torch/torch7/lib/TH/THGeneral.h.in rename to contrib/lua-torch/torch7/lib/TH/THGeneral.h.in diff --git a/contrib/torch/torch7/lib/TH/THGenerateAllTypes.h b/contrib/lua-torch/torch7/lib/TH/THGenerateAllTypes.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateAllTypes.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateAllTypes.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateByteType.h b/contrib/lua-torch/torch7/lib/TH/THGenerateByteType.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateByteType.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateByteType.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateCharType.h b/contrib/lua-torch/torch7/lib/TH/THGenerateCharType.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateCharType.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateCharType.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateDoubleType.h b/contrib/lua-torch/torch7/lib/TH/THGenerateDoubleType.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateDoubleType.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateDoubleType.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateFloatType.h b/contrib/lua-torch/torch7/lib/TH/THGenerateFloatType.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateFloatType.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateFloatType.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateFloatTypes.h b/contrib/lua-torch/torch7/lib/TH/THGenerateFloatTypes.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateFloatTypes.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateFloatTypes.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateHalfType.h b/contrib/lua-torch/torch7/lib/TH/THGenerateHalfType.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateHalfType.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateHalfType.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateIntType.h b/contrib/lua-torch/torch7/lib/TH/THGenerateIntType.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateIntType.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateIntType.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateIntTypes.h b/contrib/lua-torch/torch7/lib/TH/THGenerateIntTypes.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateIntTypes.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateIntTypes.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateLongType.h b/contrib/lua-torch/torch7/lib/TH/THGenerateLongType.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateLongType.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateLongType.h diff --git a/contrib/torch/torch7/lib/TH/THGenerateShortType.h b/contrib/lua-torch/torch7/lib/TH/THGenerateShortType.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THGenerateShortType.h rename to contrib/lua-torch/torch7/lib/TH/THGenerateShortType.h diff --git a/contrib/torch/torch7/lib/TH/THHalf.c b/contrib/lua-torch/torch7/lib/TH/THHalf.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THHalf.c rename to contrib/lua-torch/torch7/lib/TH/THHalf.c diff --git a/contrib/torch/torch7/lib/TH/THHalf.h b/contrib/lua-torch/torch7/lib/TH/THHalf.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THHalf.h rename to contrib/lua-torch/torch7/lib/TH/THHalf.h diff --git a/contrib/torch/torch7/lib/TH/THLapack.c b/contrib/lua-torch/torch7/lib/TH/THLapack.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THLapack.c rename to contrib/lua-torch/torch7/lib/TH/THLapack.c diff --git a/contrib/torch/torch7/lib/TH/THLapack.h b/contrib/lua-torch/torch7/lib/TH/THLapack.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THLapack.h rename to contrib/lua-torch/torch7/lib/TH/THLapack.h diff --git a/contrib/torch/torch7/lib/TH/THLogAdd.c b/contrib/lua-torch/torch7/lib/TH/THLogAdd.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THLogAdd.c rename to contrib/lua-torch/torch7/lib/TH/THLogAdd.c diff --git a/contrib/torch/torch7/lib/TH/THLogAdd.h b/contrib/lua-torch/torch7/lib/TH/THLogAdd.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THLogAdd.h rename to contrib/lua-torch/torch7/lib/TH/THLogAdd.h diff --git a/contrib/torch/torch7/lib/TH/THMath.h b/contrib/lua-torch/torch7/lib/TH/THMath.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THMath.h rename to contrib/lua-torch/torch7/lib/TH/THMath.h diff --git a/contrib/torch/torch7/lib/TH/THMemoryFile.c b/contrib/lua-torch/torch7/lib/TH/THMemoryFile.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THMemoryFile.c rename to contrib/lua-torch/torch7/lib/TH/THMemoryFile.c diff --git a/contrib/torch/torch7/lib/TH/THMemoryFile.h b/contrib/lua-torch/torch7/lib/TH/THMemoryFile.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THMemoryFile.h rename to contrib/lua-torch/torch7/lib/TH/THMemoryFile.h diff --git a/contrib/torch/torch7/lib/TH/THRandom.c b/contrib/lua-torch/torch7/lib/TH/THRandom.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THRandom.c rename to contrib/lua-torch/torch7/lib/TH/THRandom.c diff --git a/contrib/torch/torch7/lib/TH/THRandom.h b/contrib/lua-torch/torch7/lib/TH/THRandom.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THRandom.h rename to contrib/lua-torch/torch7/lib/TH/THRandom.h diff --git a/contrib/torch/torch7/lib/TH/THSize.c b/contrib/lua-torch/torch7/lib/TH/THSize.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THSize.c rename to contrib/lua-torch/torch7/lib/TH/THSize.c diff --git a/contrib/torch/torch7/lib/TH/THSize.h b/contrib/lua-torch/torch7/lib/TH/THSize.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THSize.h rename to contrib/lua-torch/torch7/lib/TH/THSize.h diff --git a/contrib/torch/torch7/lib/TH/THStorage.c b/contrib/lua-torch/torch7/lib/TH/THStorage.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THStorage.c rename to contrib/lua-torch/torch7/lib/TH/THStorage.c diff --git a/contrib/torch/torch7/lib/TH/THStorage.h b/contrib/lua-torch/torch7/lib/TH/THStorage.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THStorage.h rename to contrib/lua-torch/torch7/lib/TH/THStorage.h diff --git a/contrib/torch/torch7/lib/TH/THTensor.c b/contrib/lua-torch/torch7/lib/TH/THTensor.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THTensor.c rename to contrib/lua-torch/torch7/lib/TH/THTensor.c diff --git a/contrib/torch/torch7/lib/TH/THTensor.h b/contrib/lua-torch/torch7/lib/TH/THTensor.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THTensor.h rename to contrib/lua-torch/torch7/lib/TH/THTensor.h diff --git a/contrib/torch/torch7/lib/TH/THTensorApply.h b/contrib/lua-torch/torch7/lib/TH/THTensorApply.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THTensorApply.h rename to contrib/lua-torch/torch7/lib/TH/THTensorApply.h diff --git a/contrib/torch/torch7/lib/TH/THTensorDimApply.h b/contrib/lua-torch/torch7/lib/TH/THTensorDimApply.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THTensorDimApply.h rename to contrib/lua-torch/torch7/lib/TH/THTensorDimApply.h diff --git a/contrib/torch/torch7/lib/TH/THTensorMacros.h b/contrib/lua-torch/torch7/lib/TH/THTensorMacros.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THTensorMacros.h rename to contrib/lua-torch/torch7/lib/TH/THTensorMacros.h diff --git a/contrib/torch/torch7/lib/TH/THVector.c b/contrib/lua-torch/torch7/lib/TH/THVector.c similarity index 100% rename from contrib/torch/torch7/lib/TH/THVector.c rename to contrib/lua-torch/torch7/lib/TH/THVector.c diff --git a/contrib/torch/torch7/lib/TH/THVector.h b/contrib/lua-torch/torch7/lib/TH/THVector.h similarity index 100% rename from contrib/torch/torch7/lib/TH/THVector.h rename to contrib/lua-torch/torch7/lib/TH/THVector.h diff --git a/contrib/torch/torch7/lib/TH/cmake/FindARM.cmake b/contrib/lua-torch/torch7/lib/TH/cmake/FindARM.cmake similarity index 100% rename from contrib/torch/torch7/lib/TH/cmake/FindARM.cmake rename to contrib/lua-torch/torch7/lib/TH/cmake/FindARM.cmake diff --git a/contrib/torch/torch7/lib/TH/cmake/FindBLAS.cmake b/contrib/lua-torch/torch7/lib/TH/cmake/FindBLAS.cmake similarity index 100% rename from contrib/torch/torch7/lib/TH/cmake/FindBLAS.cmake rename to contrib/lua-torch/torch7/lib/TH/cmake/FindBLAS.cmake diff --git a/contrib/torch/torch7/lib/TH/cmake/FindLAPACK.cmake b/contrib/lua-torch/torch7/lib/TH/cmake/FindLAPACK.cmake similarity index 100% rename from contrib/torch/torch7/lib/TH/cmake/FindLAPACK.cmake rename to contrib/lua-torch/torch7/lib/TH/cmake/FindLAPACK.cmake diff --git a/contrib/torch/torch7/lib/TH/cmake/FindMKL.cmake b/contrib/lua-torch/torch7/lib/TH/cmake/FindMKL.cmake similarity index 100% rename from contrib/torch/torch7/lib/TH/cmake/FindMKL.cmake rename to contrib/lua-torch/torch7/lib/TH/cmake/FindMKL.cmake diff --git a/contrib/torch/torch7/lib/TH/cmake/FindSSE.cmake b/contrib/lua-torch/torch7/lib/TH/cmake/FindSSE.cmake similarity index 100% rename from contrib/torch/torch7/lib/TH/cmake/FindSSE.cmake rename to contrib/lua-torch/torch7/lib/TH/cmake/FindSSE.cmake diff --git a/contrib/torch/torch7/lib/TH/generic/THBlas.c b/contrib/lua-torch/torch7/lib/TH/generic/THBlas.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THBlas.c rename to contrib/lua-torch/torch7/lib/TH/generic/THBlas.c diff --git a/contrib/torch/torch7/lib/TH/generic/THBlas.h b/contrib/lua-torch/torch7/lib/TH/generic/THBlas.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THBlas.h rename to contrib/lua-torch/torch7/lib/TH/generic/THBlas.h diff --git a/contrib/torch/torch7/lib/TH/generic/THLapack.c b/contrib/lua-torch/torch7/lib/TH/generic/THLapack.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THLapack.c rename to contrib/lua-torch/torch7/lib/TH/generic/THLapack.c diff --git a/contrib/torch/torch7/lib/TH/generic/THLapack.h b/contrib/lua-torch/torch7/lib/TH/generic/THLapack.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THLapack.h rename to contrib/lua-torch/torch7/lib/TH/generic/THLapack.h diff --git a/contrib/torch/torch7/lib/TH/generic/THStorage.c b/contrib/lua-torch/torch7/lib/TH/generic/THStorage.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THStorage.c rename to contrib/lua-torch/torch7/lib/TH/generic/THStorage.c diff --git a/contrib/torch/torch7/lib/TH/generic/THStorage.h b/contrib/lua-torch/torch7/lib/TH/generic/THStorage.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THStorage.h rename to contrib/lua-torch/torch7/lib/TH/generic/THStorage.h diff --git a/contrib/torch/torch7/lib/TH/generic/THStorageCopy.c b/contrib/lua-torch/torch7/lib/TH/generic/THStorageCopy.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THStorageCopy.c rename to contrib/lua-torch/torch7/lib/TH/generic/THStorageCopy.c diff --git a/contrib/torch/torch7/lib/TH/generic/THStorageCopy.h b/contrib/lua-torch/torch7/lib/TH/generic/THStorageCopy.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THStorageCopy.h rename to contrib/lua-torch/torch7/lib/TH/generic/THStorageCopy.h diff --git a/contrib/torch/torch7/lib/TH/generic/THTensor.c b/contrib/lua-torch/torch7/lib/TH/generic/THTensor.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensor.c rename to contrib/lua-torch/torch7/lib/TH/generic/THTensor.c diff --git a/contrib/torch/torch7/lib/TH/generic/THTensor.h b/contrib/lua-torch/torch7/lib/TH/generic/THTensor.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensor.h rename to contrib/lua-torch/torch7/lib/TH/generic/THTensor.h diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorConv.c b/contrib/lua-torch/torch7/lib/TH/generic/THTensorConv.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorConv.c rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorConv.c diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorConv.h b/contrib/lua-torch/torch7/lib/TH/generic/THTensorConv.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorConv.h rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorConv.h diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorCopy.c b/contrib/lua-torch/torch7/lib/TH/generic/THTensorCopy.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorCopy.c rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorCopy.c diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorCopy.h b/contrib/lua-torch/torch7/lib/TH/generic/THTensorCopy.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorCopy.h rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorCopy.h diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorLapack.c b/contrib/lua-torch/torch7/lib/TH/generic/THTensorLapack.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorLapack.c rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorLapack.c diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorLapack.h b/contrib/lua-torch/torch7/lib/TH/generic/THTensorLapack.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorLapack.h rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorLapack.h diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorMath.c b/contrib/lua-torch/torch7/lib/TH/generic/THTensorMath.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorMath.c rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorMath.c diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorMath.h b/contrib/lua-torch/torch7/lib/TH/generic/THTensorMath.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorMath.h rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorMath.h diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorRandom.c b/contrib/lua-torch/torch7/lib/TH/generic/THTensorRandom.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorRandom.c rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorRandom.c diff --git a/contrib/torch/torch7/lib/TH/generic/THTensorRandom.h b/contrib/lua-torch/torch7/lib/TH/generic/THTensorRandom.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THTensorRandom.h rename to contrib/lua-torch/torch7/lib/TH/generic/THTensorRandom.h diff --git a/contrib/torch/torch7/lib/TH/generic/THVector.h b/contrib/lua-torch/torch7/lib/TH/generic/THVector.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THVector.h rename to contrib/lua-torch/torch7/lib/TH/generic/THVector.h diff --git a/contrib/torch/torch7/lib/TH/generic/THVectorDefault.c b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDefault.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THVectorDefault.c rename to contrib/lua-torch/torch7/lib/TH/generic/THVectorDefault.c diff --git a/contrib/torch/torch7/lib/TH/generic/THVectorDispatch.c b/contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/THVectorDispatch.c rename to contrib/lua-torch/torch7/lib/TH/generic/THVectorDispatch.c diff --git a/contrib/torch/torch7/lib/TH/generic/simd/common_simd.h b/contrib/lua-torch/torch7/lib/TH/generic/simd/common_simd.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/simd/common_simd.h rename to contrib/lua-torch/torch7/lib/TH/generic/simd/common_simd.h diff --git a/contrib/torch/torch7/lib/TH/generic/simd/convolve.c b/contrib/lua-torch/torch7/lib/TH/generic/simd/convolve.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/simd/convolve.c rename to contrib/lua-torch/torch7/lib/TH/generic/simd/convolve.c diff --git a/contrib/torch/torch7/lib/TH/generic/simd/convolve.h b/contrib/lua-torch/torch7/lib/TH/generic/simd/convolve.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/simd/convolve.h rename to contrib/lua-torch/torch7/lib/TH/generic/simd/convolve.h diff --git a/contrib/torch/torch7/lib/TH/generic/simd/convolve5x5_avx.c b/contrib/lua-torch/torch7/lib/TH/generic/simd/convolve5x5_avx.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/simd/convolve5x5_avx.c rename to contrib/lua-torch/torch7/lib/TH/generic/simd/convolve5x5_avx.c diff --git a/contrib/torch/torch7/lib/TH/generic/simd/convolve5x5_sse.c b/contrib/lua-torch/torch7/lib/TH/generic/simd/convolve5x5_sse.c similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/simd/convolve5x5_sse.c rename to contrib/lua-torch/torch7/lib/TH/generic/simd/convolve5x5_sse.c diff --git a/contrib/torch/torch7/lib/TH/generic/simd/simd.h b/contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h similarity index 100% rename from contrib/torch/torch7/lib/TH/generic/simd/simd.h rename to contrib/lua-torch/torch7/lib/TH/generic/simd/simd.h diff --git a/contrib/torch/torch7/lib/TH/vector/AVX.c b/contrib/lua-torch/torch7/lib/TH/vector/AVX.c similarity index 100% rename from contrib/torch/torch7/lib/TH/vector/AVX.c rename to contrib/lua-torch/torch7/lib/TH/vector/AVX.c diff --git a/contrib/torch/torch7/lib/TH/vector/AVX.h b/contrib/lua-torch/torch7/lib/TH/vector/AVX.h similarity index 100% rename from contrib/torch/torch7/lib/TH/vector/AVX.h rename to contrib/lua-torch/torch7/lib/TH/vector/AVX.h diff --git a/contrib/torch/torch7/lib/TH/vector/AVX2.c b/contrib/lua-torch/torch7/lib/TH/vector/AVX2.c similarity index 100% rename from contrib/torch/torch7/lib/TH/vector/AVX2.c rename to contrib/lua-torch/torch7/lib/TH/vector/AVX2.c diff --git a/contrib/torch/torch7/lib/TH/vector/AVX2.h b/contrib/lua-torch/torch7/lib/TH/vector/AVX2.h similarity index 100% rename from contrib/torch/torch7/lib/TH/vector/AVX2.h rename to contrib/lua-torch/torch7/lib/TH/vector/AVX2.h diff --git a/contrib/torch/torch7/lib/TH/vector/NEON.c b/contrib/lua-torch/torch7/lib/TH/vector/NEON.c similarity index 100% rename from contrib/torch/torch7/lib/TH/vector/NEON.c rename to contrib/lua-torch/torch7/lib/TH/vector/NEON.c diff --git a/contrib/torch/torch7/lib/TH/vector/SSE.c b/contrib/lua-torch/torch7/lib/TH/vector/SSE.c similarity index 100% rename from contrib/torch/torch7/lib/TH/vector/SSE.c rename to contrib/lua-torch/torch7/lib/TH/vector/SSE.c diff --git a/contrib/torch/torch7/lib/TH/vector/VSX.c b/contrib/lua-torch/torch7/lib/TH/vector/VSX.c similarity index 100% rename from contrib/torch/torch7/lib/TH/vector/VSX.c rename to contrib/lua-torch/torch7/lib/TH/vector/VSX.c diff --git a/contrib/torch/torch7/lib/luaT/CMakeLists.txt b/contrib/lua-torch/torch7/lib/luaT/CMakeLists.txt similarity index 100% rename from contrib/torch/torch7/lib/luaT/CMakeLists.txt rename to contrib/lua-torch/torch7/lib/luaT/CMakeLists.txt diff --git a/contrib/torch/torch7/lib/luaT/README.md b/contrib/lua-torch/torch7/lib/luaT/README.md similarity index 100% rename from contrib/torch/torch7/lib/luaT/README.md rename to contrib/lua-torch/torch7/lib/luaT/README.md diff --git a/contrib/torch/torch7/lib/luaT/luaT.c b/contrib/lua-torch/torch7/lib/luaT/luaT.c similarity index 100% rename from contrib/torch/torch7/lib/luaT/luaT.c rename to contrib/lua-torch/torch7/lib/luaT/luaT.c diff --git a/contrib/torch/torch7/lib/luaT/luaT.h b/contrib/lua-torch/torch7/lib/luaT/luaT.h similarity index 100% rename from contrib/torch/torch7/lib/luaT/luaT.h rename to contrib/lua-torch/torch7/lib/luaT/luaT.h diff --git a/contrib/torch/torch7/lib/luaT/luaTConfig.cmake.in b/contrib/lua-torch/torch7/lib/luaT/luaTConfig.cmake.in similarity index 100% rename from contrib/torch/torch7/lib/luaT/luaTConfig.cmake.in rename to contrib/lua-torch/torch7/lib/luaT/luaTConfig.cmake.in diff --git a/contrib/torch/torch7/mkdocs.yml b/contrib/lua-torch/torch7/mkdocs.yml similarity index 100% rename from contrib/torch/torch7/mkdocs.yml rename to contrib/lua-torch/torch7/mkdocs.yml diff --git a/contrib/torch/torch7/paths.lua.in b/contrib/lua-torch/torch7/paths.lua.in similarity index 100% rename from contrib/torch/torch7/paths.lua.in rename to contrib/lua-torch/torch7/paths.lua.in diff --git a/contrib/torch/torch7/random.c b/contrib/lua-torch/torch7/random.c similarity index 100% rename from contrib/torch/torch7/random.c rename to contrib/lua-torch/torch7/random.c diff --git a/contrib/torch/torch7/random.lua b/contrib/lua-torch/torch7/random.lua similarity index 100% rename from contrib/torch/torch7/random.lua rename to contrib/lua-torch/torch7/random.lua diff --git a/contrib/torch/torch7/test/longSize.lua b/contrib/lua-torch/torch7/test/longSize.lua similarity index 100% rename from contrib/torch/torch7/test/longSize.lua rename to contrib/lua-torch/torch7/test/longSize.lua diff --git a/contrib/torch/torch7/test/test.lua b/contrib/lua-torch/torch7/test/test.lua similarity index 100% rename from contrib/torch/torch7/test/test.lua rename to contrib/lua-torch/torch7/test/test.lua diff --git a/contrib/torch/torch7/test/test_Multinomial.lua b/contrib/lua-torch/torch7/test/test_Multinomial.lua similarity index 100% rename from contrib/torch/torch7/test/test_Multinomial.lua rename to contrib/lua-torch/torch7/test/test_Multinomial.lua diff --git a/contrib/torch/torch7/test/test_Tester.lua b/contrib/lua-torch/torch7/test/test_Tester.lua similarity index 100% rename from contrib/torch/torch7/test/test_Tester.lua rename to contrib/lua-torch/torch7/test/test_Tester.lua diff --git a/contrib/torch/torch7/test/test_half.lua b/contrib/lua-torch/torch7/test/test_half.lua similarity index 100% rename from contrib/torch/torch7/test/test_half.lua rename to contrib/lua-torch/torch7/test/test_half.lua diff --git a/contrib/torch/torch7/test/test_qr.lua b/contrib/lua-torch/torch7/test/test_qr.lua similarity index 100% rename from contrib/torch/torch7/test/test_qr.lua rename to contrib/lua-torch/torch7/test/test_qr.lua diff --git a/contrib/torch/torch7/test/test_sharedmem.lua b/contrib/lua-torch/torch7/test/test_sharedmem.lua similarity index 100% rename from contrib/torch/torch7/test/test_sharedmem.lua rename to contrib/lua-torch/torch7/test/test_sharedmem.lua diff --git a/contrib/torch/torch7/test/test_timer.lua b/contrib/lua-torch/torch7/test/test_timer.lua similarity index 100% rename from contrib/torch/torch7/test/test_timer.lua rename to contrib/lua-torch/torch7/test/test_timer.lua diff --git a/contrib/torch/torch7/test/test_writeObject.lua b/contrib/lua-torch/torch7/test/test_writeObject.lua similarity index 100% rename from contrib/torch/torch7/test/test_writeObject.lua rename to contrib/lua-torch/torch7/test/test_writeObject.lua diff --git a/contrib/torch/torch7/test/timeSort.lua b/contrib/lua-torch/torch7/test/timeSort.lua similarity index 100% rename from contrib/torch/torch7/test/timeSort.lua rename to contrib/lua-torch/torch7/test/timeSort.lua diff --git a/contrib/torch/torch7/torchcwrap.lua b/contrib/lua-torch/torch7/torchcwrap.lua similarity index 100% rename from contrib/torch/torch7/torchcwrap.lua rename to contrib/lua-torch/torch7/torchcwrap.lua diff --git a/contrib/torch/torch7/utils.c b/contrib/lua-torch/torch7/utils.c similarity index 100% rename from contrib/torch/torch7/utils.c rename to contrib/lua-torch/torch7/utils.c diff --git a/contrib/torch/torch7/utils.h b/contrib/lua-torch/torch7/utils.h similarity index 100% rename from contrib/torch/torch7/utils.h rename to contrib/lua-torch/torch7/utils.h