diff options
| author | Determinant <ted.sybil@gmail.com> | 2015-06-25 12:58:42 +0800 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2015-06-25 12:58:42 +0800 |
| commit | 8b2aa75b9d7c0b4d4333e7847e3ad90c5fcf97fb (patch) | |
| tree | 7a7ac0325bb15597fb473e7b3bcf1a54e4e5bd16 /nerv/matrix/generic | |
| parent | 5e407d74130accfbbf94d2cabcb03fc126a89410 (diff) | |
use the standard nerv error reporting in io lib
Diffstat (limited to 'nerv/matrix/generic')
| -rw-r--r-- | nerv/matrix/generic/cumatrix.c | 4 | ||||
| -rw-r--r-- | nerv/matrix/generic/matrix.c | 2 | ||||
| -rw-r--r-- | nerv/matrix/generic/mmatrix.c | 4 |
3 files changed, 5 insertions, 5 deletions
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) { |