use the standard nerv error reporting in io lib

6 files changed, 8 insertions, 8 deletions

diff --git a/nerv/matrix/cumatrix.c b/nerv/matrix/cumatrix.c
index 1bcb0f1..fef03fc 100644
--- a/nerv/matrix/cumatrix.c
+++ b/nerv/matrix/cumatrix.c
@@ -1,5 +1,5 @@
 #define NERV_GENERIC_CUMATRIX
-#include "../common.h"
+#include "../lib/common.h"
 #include "../lib/matrix/cumatrix.h"
 #include "../lib/matrix/cuda_helper.h"
 #include <string.h>
diff --git a/nerv/matrix/generic/cumatrix.c b/nerv/matrix/generic/cumatrix.c
index 859718e..311b503 100644
--- a/nerv/matrix/generic/cumatrix.c
+++ b/nerv/matrix/generic/cumatrix.c
@@ -1,5 +1,4 @@
 #ifdef NERV_GENERIC_CUMATRIX
-#include "../../lib/matrix/generic/matrix.h"
 #include "elem_type.h"
 #define MATRIX_DATA_WRITE(L, data, idx, val) cuda_matrix_(write)(L, data, idx, val)
 #define MATRIX_DATA_READ(L, data, idx) cuda_matrix_(read)(L, data, idx)
@@ -7,7 +6,8 @@
 #define MATRIX_BASE_TNAME nerv_matrix_cuda_tname
 #define NERV_GENERIC_MATRIX
 #define NERV_GENERIC_CUKERNEL
-#include "../../common.h"
+#include "../../lib/common.h"
+#include "../../lib/matrix/generic/matrix.h"
 #include "../../lib/matrix/generic/cumatrix.h"
 
 static int nerv_matrix_(lua_add)(lua_State *L) {
diff --git a/nerv/matrix/generic/matrix.c b/nerv/matrix/generic/matrix.c
index 9d2521b..ff89e54 100644
--- a/nerv/matrix/generic/matrix.c
+++ b/nerv/matrix/generic/matrix.c
@@ -1,5 +1,5 @@
 #ifdef NERV_GENERIC_MATRIX
-#include "../../common.h"
+#include "../../lib/common.h"
 #include "../../lib/matrix/generic/matrix.h"
 
 extern const char *nerv_matrix_(tname);
diff --git a/nerv/matrix/generic/mmatrix.c b/nerv/matrix/generic/mmatrix.c
index 233102a..01dd9e5 100644
--- a/nerv/matrix/generic/mmatrix.c
+++ b/nerv/matrix/generic/mmatrix.c
@@ -6,9 +6,9 @@
 #define MATRIX_INIT(L) host_matrix_(init)(L)
 #define MATRIX_BASE_TNAME nerv_matrix_host_tname
 #define NERV_GENERIC_MATRIX
-#include "../../common.h"
-#include "../../io/chunk_file.h"
+#include "../../lib/common.h"
 #include "../../lib/matrix/generic/mmatrix.h"
+#include "../../io/chunk_file.h"
 #include "string.h"
 
 int nerv_matrix_(lua_get_elem)(lua_State *L) {
diff --git a/nerv/matrix/init.c b/nerv/matrix/init.c
index 27472b9..78a0dd9 100644
--- a/nerv/matrix/init.c
+++ b/nerv/matrix/init.c
@@ -1,4 +1,4 @@
-#include "../common.h"
+#include "../lib/common.h"
 
 const char *nerv_matrix_tname = "nerv.Matrix";
 const char *nerv_matrix_cuda_tname = "nerv.CuMatrix";
diff --git a/nerv/matrix/mmatrix.c b/nerv/matrix/mmatrix.c
index b25af03..5561572 100644
--- a/nerv/matrix/mmatrix.c
+++ b/nerv/matrix/mmatrix.c
@@ -1,6 +1,6 @@
 #define NERV_GENERIC_MMATRIX
 #include <stdlib.h>
-#include "../common.h"
+#include "../lib/common.h"
 void nerv_matrix_host_float_lua_init(lua_State *L);
 void nerv_matrix_host_double_lua_init(lua_State *L);
 void nerv_matrix_host_int_lua_init(lua_State *L);