aboutsummaryrefslogtreecommitdiff
path: root/nerv/matrix
diff options
context:
space:
mode:
authorDeterminant <ted.sybil@gmail.com>2016-02-24 17:26:45 +0800
committerDeterminant <ted.sybil@gmail.com>2016-02-24 17:26:45 +0800
commit550680eacd00555817df19d2b59a20a92df77c42 (patch)
treebe9e39e2115fa95e99e32791898ba5593ca3b23f /nerv/matrix
parente91fc2ddaa74dd2c46ce93c9e92020d66c037c8e (diff)
clean up code
Diffstat (limited to 'nerv/matrix')
-rw-r--r--nerv/matrix/cumatrix.c1
-rw-r--r--nerv/matrix/generic/cumatrix.c4
-rw-r--r--nerv/matrix/generic/matrix.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/nerv/matrix/cumatrix.c b/nerv/matrix/cumatrix.c
index 26b055b..f6a4ed5 100644
--- a/nerv/matrix/cumatrix.c
+++ b/nerv/matrix/cumatrix.c
@@ -3,7 +3,6 @@
#include "../lib/matrix/cumatrix.h"
#include "../lib/matrix/cuda_helper.h"
#include <string.h>
-#define PROFILE_HASHMAP_SIZE 123457
const char *nerv_cuda_context_tname = "nerv.CuContext";
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;