diff options
| author | Determinant <ted.sybil@gmail.com> | 2015-06-07 21:59:10 +0800 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2015-06-07 21:59:10 +0800 |
| commit | 0f30b1a4b5e583cb1df7dbb349c1af4378e41369 (patch) | |
| tree | 967c6326b83cda2b92eee5f597dde0e74b071dbb /matrix/generic | |
| parent | 6e720b961f7edac9c3a41affe0ca40dd0ec9fc85 (diff) | |
fix minor bugs in cumatrix; clean up part of code
Diffstat (limited to 'matrix/generic')
| -rw-r--r-- | matrix/generic/cumatrix.c | 6 | ||||
| -rw-r--r-- | matrix/generic/matrix.c | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/matrix/generic/cumatrix.c b/matrix/generic/cumatrix.c index a340aef..a8e18e0 100644 --- a/matrix/generic/cumatrix.c +++ b/matrix/generic/cumatrix.c @@ -11,11 +11,9 @@ #define MATRIX_BASE_TNAME nerv_matrix_cuda_tname #define NERV_GENERIC_MATRIX #define NERV_GENERIC_CUKERNEL -#define PROFILE_HASHMAP_SIZE 123457 #include "../../common.h" #include "../cukernel.h" #include "../cuda_helper.h" -#include <string.h> Matrix *nerv_matrix_(new_)(lua_State *L, long nrow, long ncol); void nerv_matrix_(data_free)(lua_State *L, Matrix *self); @@ -442,10 +440,6 @@ static const luaL_Reg nerv_matrix_(extra_methods)[] = { static void cuda_matrix_(init)(lua_State *L) { luaN_append_methods(L, nerv_matrix_(extra_methods)); - cublasCreate(&cublas_handle); - cudaEventCreate(&profile_start); - cudaEventCreate(&profile_stop); - profile = hashmap_create(PROFILE_HASHMAP_SIZE, bkdr_hash, strcmp); } static void cuda_matrix_(free)(lua_State *L, MATRIX_ELEM *ptr) { diff --git a/matrix/generic/matrix.c b/matrix/generic/matrix.c index d6b0aea..e17fb42 100644 --- a/matrix/generic/matrix.c +++ b/matrix/generic/matrix.c @@ -6,6 +6,7 @@ extern const char *nerv_matrix_(tname); extern const char *MATRIX_BASE_TNAME; void nerv_matrix_(data_free)(lua_State *L, Matrix *self) { + (void)L; assert(*self->data_ref > 0); if (--(*self->data_ref) == 0) { |