let HTK I/O implementation be a single package

47 files changed, 51 insertions, 52 deletions

diff --git a/Makefile b/Makefile
deleted file mode 100644
index a077df8..0000000
--- a/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-.PHONY: tnet
-SHELL := /bin/bash
-BUILD_DIR := $(CURDIR)/build
-OBJS := init.o tnet_io/cwrapper.o tnet_io/init.o
-LIBS := libspeech.so
-LUA_LIBS := init.lua
-INCLUDE := -I $(LUA_INCDIR) -DLUA_USE_APICHECK
-
-SUBDIR := tnet_io
-OBJ_DIR := $(BUILD_DIR)/objs
-LUA_DIR = $(INST_LUADIR)/speech
-
-OBJS := $(addprefix $(OBJ_DIR)/,$(OBJS))
-LIBS := $(addprefix $(INST_LIBDIR)/,$(LIBS))
-OBJ_SUBDIR := $(addprefix $(OBJ_DIR)/,$(SUBDIR))
-LUA_SUBDIR := $(addprefix $(LUA_DIR)/,$(SUBDIR))
-LUA_LIBS := $(addprefix $(LUA_DIR)/,$(LUA_LIBS))
-LIB_PATH := $(LUA_BINDIR)/../lib
-
-build: $(OBJ_DIR) $(OBJ_SUBDIR) $(OBJS) tnet $(OBJ_DIR)/tnet_io/test
-install: $(LUA_DIR) $(LUA_SUBDIR) $(LUA_LIBS) $(LIBS)
-
-$(OBJ_DIR) $(LUA_DIR) $(OBJ_SUBDIR) $(LUA_SUBDIR):
-	-mkdir -p $@
-$(LUA_DIR)/%.lua: %.lua
-	cp $< $@
-$(LIBS): $(OBJ_DIR)/tnet_io/cwrapper.o $(OBJ_DIR)/init.o $(OBJ_DIR)/tnet_io/init.o $(OBJ_DIR)/tnet_io/libKaldiLib.a
-	gcc -shared -o $@ $(OBJ_DIR)/tnet_io/cwrapper.o $(OBJ_DIR)/init.o $(OBJ_DIR)/tnet_io/libKaldiLib.a $(OBJ_DIR)/tnet_io/init.o -lstdc++ -Wl,-rpath=$(LIB_PATH) -L$(LIB_PATH) -lnervcore -lluaT
-$(OBJ_DIR)/tnet_io/test: $(OBJ_DIR)/tnet_io/cwrapper.o $(OBJ_DIR)/tnet_io/test.o $(OBJ_DIR)/tnet_io/libKaldiLib.a
-	gcc -o $@ $^ -Wl,-rpath=$(LIB_PATH) -L$(LIB_PATH) -lnervcore -Wl,-rpath=$(LUA_LIBDIR) -L$(LUA_LIBDIR) -lluajit-5.1 -lstdc++ -lm
-$(OBJ_DIR)/tnet_io/cwrapper.o: tnet_io/cwrapper.cpp
-	g++ -o $@ -c $< -DHAVE_ATLAS -I tnet_io/KaldiLib/ -g -fPIC $(INCLUDE)
-$(OBJ_DIR)/%.o: %.c
-	gcc -o $@ -c $< -g $(INCLUDE) -fPIC
-clean:
-	-rm $(OBJ_DIR)/tnet_io/*.o
-	$(MAKE) -C tnet_io/KaldiLib/ clean
-tnet:
-	$(MAKE) -C tnet_io/KaldiLib/ OBJ_DIR=$(OBJ_DIR)/tnet_io
diff --git a/htk_io/Makefile b/htk_io/Makefile
new file mode 100644
index 0000000..d32d17a
--- /dev/null
+++ b/htk_io/Makefile
@@ -0,0 +1,40 @@
+.PHONY: tnet
+SHELL := /bin/bash
+BUILD_DIR := $(CURDIR)/build
+INC_PATH := $(LUA_BINDIR)/../include/
+OBJS := init.o src/cwrapper.o src/init.o
+LIBS := libhtkio.so
+LUA_LIBS := init.lua
+INCLUDE := -I $(LUA_INCDIR) -I $(INC_PATH) -DLUA_USE_APICHECK
+
+SUBDIR := src
+OBJ_DIR := $(BUILD_DIR)/objs
+LUA_DIR = $(INST_LUADIR)/htk_io
+
+OBJS := $(addprefix $(OBJ_DIR)/,$(OBJS))
+LIBS := $(addprefix $(INST_LIBDIR)/,$(LIBS))
+OBJ_SUBDIR := $(addprefix $(OBJ_DIR)/,$(SUBDIR))
+LUA_SUBDIR := $(addprefix $(LUA_DIR)/,$(SUBDIR))
+LUA_LIBS := $(addprefix $(LUA_DIR)/,$(LUA_LIBS))
+LIB_PATH := $(LUA_BINDIR)/../lib
+
+build: $(OBJ_DIR) $(OBJ_SUBDIR) $(OBJS) tnet $(OBJ_DIR)/src/test
+install: $(LUA_DIR) $(LUA_SUBDIR) $(LUA_LIBS) $(LIBS)
+
+$(OBJ_DIR) $(LUA_DIR) $(OBJ_SUBDIR) $(LUA_SUBDIR):
+	-mkdir -p $@
+$(LUA_DIR)/%.lua: %.lua
+	cp $< $@
+$(LIBS): $(OBJ_DIR)/src/cwrapper.o $(OBJ_DIR)/init.o $(OBJ_DIR)/src/init.o $(OBJ_DIR)/src/libKaldiLib.a
+	gcc -shared -o $@ $(OBJ_DIR)/src/cwrapper.o $(OBJ_DIR)/init.o $(OBJ_DIR)/src/libKaldiLib.a $(OBJ_DIR)/src/init.o -lstdc++ -Wl,-rpath=$(LIB_PATH) -L$(LIB_PATH) -lnervcore -lluaT
+$(OBJ_DIR)/src/test: $(OBJ_DIR)/src/cwrapper.o $(OBJ_DIR)/src/test.o $(OBJ_DIR)/src/libKaldiLib.a
+	gcc -o $@ $^ -Wl,-rpath=$(LIB_PATH) -L$(LIB_PATH) -lnervcore -Wl,-rpath=$(LUA_LIBDIR) -L$(LUA_LIBDIR) -lluajit-5.1 -lstdc++ -lm
+$(OBJ_DIR)/src/cwrapper.o: src/cwrapper.cpp
+	g++ -o $@ -c $< -DHAVE_ATLAS -I src/KaldiLib/ -g -fPIC $(INCLUDE)
+$(OBJ_DIR)/%.o: %.c
+	gcc -o $@ -c $< -g $(INCLUDE) -fPIC
+clean:
+	-rm $(OBJ_DIR)/src/*.o
+	$(MAKE) -C src/KaldiLib/ clean
+tnet:
+	$(MAKE) -C src/KaldiLib/ OBJ_DIR=$(OBJ_DIR)/src
diff --git a/examples/tnet_io_example.lua b/htk_io/examples/tnet_io_example.lua
index eea73a5..eea73a5 100644
--- a/examples/tnet_io_example.lua
+++ b/htk_io/examples/tnet_io_example.lua
diff --git a/examples/tnet_preprocessing_example.lua b/htk_io/examples/tnet_preprocessing_example.lua
index 9e1c0ce..9e1c0ce 100644
--- a/examples/tnet_preprocessing_example.lua
+++ b/htk_io/examples/tnet_preprocessing_example.lua
diff --git a/examples/tnet_preprocessing_example2.lua b/htk_io/examples/tnet_preprocessing_example2.lua
index 1215b23..1215b23 100644
--- a/examples/tnet_preprocessing_example2.lua
+++ b/htk_io/examples/tnet_preprocessing_example2.lua
diff --git a/examples/tnet_sgd_buffer.lua b/htk_io/examples/tnet_sgd_buffer.lua
index 152d2f5..152d2f5 100644
--- a/examples/tnet_sgd_buffer.lua
+++ b/htk_io/examples/tnet_sgd_buffer.lua
diff --git a/speech-scm-1.rockspec b/htk_io/htk_io-scm-1.rockspec
index bf11cbc..59fa8f0 100644
--- a/speech-scm-1.rockspec
+++ b/htk_io/htk_io-scm-1.rockspec
@@ -1,22 +1,20 @@
-package = "speech"
+package = "htk_io"
 version = "scm-1"
 source = {
-    url = "..." -- We don't have one yet
+    url = "https://github.com/Determinant/nerv-speech.git"
 }
 description = {
-    summary = "An example for the LuaRocks tutorial.",
+    summary = "HTK I/O support for Nerv",
     detailed = [[
     ]],
-    homepage = "https://github.com/Determinant/nerv-speech", -- We don't have one yet
-    license = "BSD" -- or whatever you like
+    homepage = "https://github.com/Determinant/nerv-speech",
+    license = "BSD"
 }
 dependencies = {
     "nerv >= scm-1",
     "lua >= 5.1"
-    -- If you depend on other rocks, add them here
 }
 build = {
-    -- We'll start here.
     type = "make",
     build_variables = {
         CFLAGS="$(CFLAGS)",
diff --git a/init.c b/htk_io/init.c
index fef5527..edd454f 100644
--- a/init.c
+++ b/htk_io/init.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 extern void tnet_io_init(lua_State *L);
-int luaopen_libspeech(lua_State *L) {
+int luaopen_libhtkio(lua_State *L) {
     tnet_io_init(L);
     return 1;
 }
diff --git a/init.lua b/htk_io/init.lua
index fec7209..27ece6e 100644
--- a/init.lua
+++ b/htk_io/init.lua
@@ -1,4 +1,4 @@
-require 'libspeech'
+require 'libhtkio'
 local TNetReader = nerv.class("nerv.TNetReader", "nerv.DataReader")
 
 function TNetReader:__init(global_conf, reader_conf)
diff --git a/tnet_io/KaldiLib/Common.cc b/htk_io/src/KaldiLib/Common.cc
index 40909ee..40909ee 100644
--- a/tnet_io/KaldiLib/Common.cc
+++ b/htk_io/src/KaldiLib/Common.cc
diff --git a/tnet_io/KaldiLib/Common.h b/htk_io/src/KaldiLib/Common.h
index 9cd9658..9cd9658 100644
--- a/tnet_io/KaldiLib/Common.h
+++ b/htk_io/src/KaldiLib/Common.h
diff --git a/tnet_io/KaldiLib/Error.h b/htk_io/src/KaldiLib/Error.h
index 2228dde..2228dde 100644
--- a/tnet_io/KaldiLib/Error.h
+++ b/htk_io/src/KaldiLib/Error.h
diff --git a/tnet_io/KaldiLib/Features.cc b/htk_io/src/KaldiLib/Features.cc
index 64b63e8..64b63e8 100644
--- a/tnet_io/KaldiLib/Features.cc
+++ b/htk_io/src/KaldiLib/Features.cc
diff --git a/tnet_io/KaldiLib/Features.h b/htk_io/src/KaldiLib/Features.h
index 0980ab6..0980ab6 100644
--- a/tnet_io/KaldiLib/Features.h
+++ b/htk_io/src/KaldiLib/Features.h
diff --git a/tnet_io/KaldiLib/Labels.cc b/htk_io/src/KaldiLib/Labels.cc
index 8b04cde..8b04cde 100644
--- a/tnet_io/KaldiLib/Labels.cc
+++ b/htk_io/src/KaldiLib/Labels.cc
diff --git a/tnet_io/KaldiLib/Labels.h b/htk_io/src/KaldiLib/Labels.h
index 409a080..409a080 100644
--- a/tnet_io/KaldiLib/Labels.h
+++ b/htk_io/src/KaldiLib/Labels.h
diff --git a/tnet_io/KaldiLib/Makefile b/htk_io/src/KaldiLib/Makefile
index 61e0a59..61e0a59 100644
--- a/tnet_io/KaldiLib/Makefile
+++ b/htk_io/src/KaldiLib/Makefile
diff --git a/tnet_io/KaldiLib/MathAux.h b/htk_io/src/KaldiLib/MathAux.h
index c08e836..c08e836 100644
--- a/tnet_io/KaldiLib/MathAux.h
+++ b/htk_io/src/KaldiLib/MathAux.h
diff --git a/tnet_io/KaldiLib/Matrix.cc b/htk_io/src/KaldiLib/Matrix.cc
index f9d5909..f9d5909 100644
--- a/tnet_io/KaldiLib/Matrix.cc
+++ b/htk_io/src/KaldiLib/Matrix.cc
diff --git a/tnet_io/KaldiLib/Matrix.h b/htk_io/src/KaldiLib/Matrix.h
index d33cb0c..d33cb0c 100644
--- a/tnet_io/KaldiLib/Matrix.h
+++ b/htk_io/src/KaldiLib/Matrix.h
diff --git a/tnet_io/KaldiLib/Matrix.tcc b/htk_io/src/KaldiLib/Matrix.tcc
index f6ffb8f..f6ffb8f 100644
--- a/tnet_io/KaldiLib/Matrix.tcc
+++ b/htk_io/src/KaldiLib/Matrix.tcc
diff --git a/tnet_io/KaldiLib/MlfStream.cc b/htk_io/src/KaldiLib/MlfStream.cc
index a2f6478..a2f6478 100644
--- a/tnet_io/KaldiLib/MlfStream.cc
+++ b/htk_io/src/KaldiLib/MlfStream.cc
diff --git a/tnet_io/KaldiLib/MlfStream.h b/htk_io/src/KaldiLib/MlfStream.h
index d643f5c..d643f5c 100644
--- a/tnet_io/KaldiLib/MlfStream.h
+++ b/htk_io/src/KaldiLib/MlfStream.h
diff --git a/tnet_io/KaldiLib/MlfStream.tcc b/htk_io/src/KaldiLib/MlfStream.tcc
index 8978545..8978545 100644
--- a/tnet_io/KaldiLib/MlfStream.tcc
+++ b/htk_io/src/KaldiLib/MlfStream.tcc
diff --git a/tnet_io/KaldiLib/StkMatch.cc b/htk_io/src/KaldiLib/StkMatch.cc
index 4ff4b18..4ff4b18 100644
--- a/tnet_io/KaldiLib/StkMatch.cc
+++ b/htk_io/src/KaldiLib/StkMatch.cc
diff --git a/tnet_io/KaldiLib/StkMatch.h b/htk_io/src/KaldiLib/StkMatch.h
index 42c6b97..42c6b97 100644
--- a/tnet_io/KaldiLib/StkMatch.h
+++ b/htk_io/src/KaldiLib/StkMatch.h
diff --git a/tnet_io/KaldiLib/StkStream.h b/htk_io/src/KaldiLib/StkStream.h
index ca8de30..ca8de30 100644
--- a/tnet_io/KaldiLib/StkStream.h
+++ b/htk_io/src/KaldiLib/StkStream.h
diff --git a/tnet_io/KaldiLib/StkStream.tcc b/htk_io/src/KaldiLib/StkStream.tcc
index e3de1ae..e3de1ae 100644
--- a/tnet_io/KaldiLib/StkStream.tcc
+++ b/htk_io/src/KaldiLib/StkStream.tcc
diff --git a/tnet_io/KaldiLib/Timer.cc b/htk_io/src/KaldiLib/Timer.cc
index 692969b..692969b 100644
--- a/tnet_io/KaldiLib/Timer.cc
+++ b/htk_io/src/KaldiLib/Timer.cc
diff --git a/tnet_io/KaldiLib/Timer.h b/htk_io/src/KaldiLib/Timer.h
index b220b93..b220b93 100644
--- a/tnet_io/KaldiLib/Timer.h
+++ b/htk_io/src/KaldiLib/Timer.h
diff --git a/tnet_io/KaldiLib/Tokenizer.cc b/htk_io/src/KaldiLib/Tokenizer.cc
index 0c49050..0c49050 100644
--- a/tnet_io/KaldiLib/Tokenizer.cc
+++ b/htk_io/src/KaldiLib/Tokenizer.cc
diff --git a/tnet_io/KaldiLib/Tokenizer.h b/htk_io/src/KaldiLib/Tokenizer.h
index 1be717b..1be717b 100644
--- a/tnet_io/KaldiLib/Tokenizer.h
+++ b/htk_io/src/KaldiLib/Tokenizer.h
diff --git a/tnet_io/KaldiLib/Types.h b/htk_io/src/KaldiLib/Types.h
index 6a5bfac..6a5bfac 100644
--- a/tnet_io/KaldiLib/Types.h
+++ b/htk_io/src/KaldiLib/Types.h
diff --git a/tnet_io/KaldiLib/UserInterface.cc b/htk_io/src/KaldiLib/UserInterface.cc
index b59a6c5..b59a6c5 100644
--- a/tnet_io/KaldiLib/UserInterface.cc
+++ b/htk_io/src/KaldiLib/UserInterface.cc
diff --git a/tnet_io/KaldiLib/UserInterface.h b/htk_io/src/KaldiLib/UserInterface.h
index fa189e7..fa189e7 100644
--- a/tnet_io/KaldiLib/UserInterface.h
+++ b/htk_io/src/KaldiLib/UserInterface.h
diff --git a/tnet_io/KaldiLib/Vector.cc b/htk_io/src/KaldiLib/Vector.cc
index 020bae2..020bae2 100644
--- a/tnet_io/KaldiLib/Vector.cc
+++ b/htk_io/src/KaldiLib/Vector.cc
diff --git a/tnet_io/KaldiLib/Vector.h b/htk_io/src/KaldiLib/Vector.h
index 384c5d2..384c5d2 100644
--- a/tnet_io/KaldiLib/Vector.h
+++ b/htk_io/src/KaldiLib/Vector.h
diff --git a/tnet_io/KaldiLib/Vector.tcc b/htk_io/src/KaldiLib/Vector.tcc
index 751ffa7..751ffa7 100644
--- a/tnet_io/KaldiLib/Vector.tcc
+++ b/htk_io/src/KaldiLib/Vector.tcc
diff --git a/tnet_io/KaldiLib/clapack.cc b/htk_io/src/KaldiLib/clapack.cc
index a486bef..a486bef 100644
--- a/tnet_io/KaldiLib/clapack.cc
+++ b/htk_io/src/KaldiLib/clapack.cc
diff --git a/tnet_io/KaldiLib/clapack.h b/htk_io/src/KaldiLib/clapack.h
index 0c6855d..0c6855d 100644
--- a/tnet_io/KaldiLib/clapack.h
+++ b/htk_io/src/KaldiLib/clapack.h
diff --git a/tnet_io/cwrapper.cpp b/htk_io/src/cwrapper.cpp
index 98ad864..b7ce2d5 100644
--- a/tnet_io/cwrapper.cpp
+++ b/htk_io/src/cwrapper.cpp
@@ -8,7 +8,7 @@
 extern "C" {
 #include "cwrapper.h"
 #include "string.h"
-#include "../../nerv/common.h"
+#include "nerv/common.h"
 
     extern Matrix *nerv_matrix_host_float_create(long nrow, long ncol, Status *status);
 
diff --git a/tnet_io/cwrapper.h b/htk_io/src/cwrapper.h
index a52770b..e1bce6e 100644
--- a/tnet_io/cwrapper.h
+++ b/htk_io/src/cwrapper.h
@@ -1,7 +1,7 @@
 #ifndef NERV_TNET_IO_CWRAPPER
 #define NERV_TNET_IO_CWRAPPER
-#include "../../nerv/lib/matrix/matrix.h"
-#include "../../nerv/common.h"
+#include "nerv/matrix/matrix.h"
+#include "nerv/common.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/tnet_io/init.c b/htk_io/src/init.c
index 3e3f90d..8a1ec3b 100644
--- a/tnet_io/init.c
+++ b/htk_io/src/init.c
@@ -1,4 +1,4 @@
-#include "../../nerv/common.h"
+#include "nerv/common.h"
 #include "cwrapper.h"
 #include <stdio.h>
 
diff --git a/tnet_io/test.c b/htk_io/src/test.c
index 6812ef1..6812ef1 100644
--- a/tnet_io/test.c
+++ b/htk_io/src/test.c
diff --git a/tnet_io/tnet.mk b/htk_io/src/tnet.mk
index 9f933db..9f933db 100644
--- a/tnet_io/tnet.mk
+++ b/htk_io/src/tnet.mk
diff --git a/tools/tnet_to_nerv.c b/htk_io/tools/tnet_to_nerv.c
index f781236..f781236 100644
--- a/tools/tnet_to_nerv.c
+++ b/htk_io/tools/tnet_to_nerv.c
diff --git a/tools/tnet_to_nerv.cpp b/htk_io/tools/tnet_to_nerv.cpp
index bbfddcf..bbfddcf 100644
--- a/tools/tnet_to_nerv.cpp
+++ b/htk_io/tools/tnet_to_nerv.cpp