aboutsummaryrefslogtreecommitdiff
path: root/nerv/matrix/generic
diff options
context:
space:
mode:
Diffstat (limited to 'nerv/matrix/generic')
-rw-r--r--nerv/matrix/generic/cumatrix.c4
-rw-r--r--nerv/matrix/generic/matrix.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/nerv/matrix/generic/cumatrix.c b/nerv/matrix/generic/cumatrix.c
index 16c0e3a..00e4ee3 100644
--- a/nerv/matrix/generic/cumatrix.c
+++ b/nerv/matrix/generic/cumatrix.c
@@ -1,4 +1,6 @@
#ifdef NERV_GENERIC_CUMATRIX
+#include "../matrix.h"
+#include "../../lib/matrix/generic/matrix.h"
#include "../../lib/matrix/generic/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)
@@ -6,9 +8,7 @@
#define MATRIX_BASE_TNAME nerv_matrix_cuda_tname
#define NERV_GENERIC_MATRIX
#define NERV_GENERIC_CUKERNEL
-#include "../matrix.h"
#include "../../lib/common.h"
-#include "../../lib/matrix/generic/matrix.h"
#include "../../lib/matrix/generic/cumatrix.h"
#define BLAS_OP_N CUBLAS_OP_N
diff --git a/nerv/matrix/generic/matrix.c b/nerv/matrix/generic/matrix.c
index c2e57b8..8c2f871 100644
--- a/nerv/matrix/generic/matrix.c
+++ b/nerv/matrix/generic/matrix.c
@@ -1,7 +1,7 @@
#ifdef NERV_GENERIC_MATRIX
#include "../matrix.h"
-#include "../../lib/common.h"
#include "../../lib/matrix/generic/matrix.h"
+#include "../../lib/common.h"
extern const char *nerv_matrix_(tname);
extern const char *MATRIX_BASE_TNAME;