diff options
| author | Determinant <ted.sybil@gmail.com> | 2016-02-15 15:04:13 +0800 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2016-02-15 15:04:13 +0800 |
| commit | 3362020a6bc43766a92882abe6d127c8bb98a628 (patch) | |
| tree | cad93eb88c2813694c0ae4ca4ecb9873a719ad85 /nerv/matrix/mmatrix.c | |
| parent | dcad8a3f80fc55ca93984d981f9b829d2e4ea728 (diff) | |
try a basic merge
Diffstat (limited to 'nerv/matrix/mmatrix.c')
| -rw-r--r-- | nerv/matrix/mmatrix.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nerv/matrix/mmatrix.c b/nerv/matrix/mmatrix.c index 20c31d6..a68506d 100644 --- a/nerv/matrix/mmatrix.c +++ b/nerv/matrix/mmatrix.c @@ -15,6 +15,7 @@ void nerv_lua_mmatrix_init(lua_State *L) { #define MATRIX_USE_FLOAT #define host_matrix_(NAME) host_matrix_float_##NAME #define nerv_matrix_(NAME) nerv_matrix_host_float_##NAME +#define MATRIX_MMATRIX_CUDA_TNAME nerv_matrix_cuda_float_tname const char *nerv_matrix_(tname) = "nerv.MMatrixFloat"; #define MMATRIX_INIT(L) host_matrix_(init_extra)(L) @@ -49,11 +50,13 @@ static const luaL_Reg nerv_matrix_(extra_methods_int)[] = { #undef MATRIX_ELEM_FMT #undef MATRIX_ELEM_WRITE_FMT #undef MMATRIX_INIT +#undef MATRIX_MMATRIX_CUDA_TNAME #define NERV_GENERIC_MMATRIX #define MATRIX_USE_DOUBLE #define host_matrix_(NAME) host_matrix_double_##NAME #define nerv_matrix_(NAME) nerv_matrix_host_double_##NAME +#define MATRIX_MMATRIX_CUDA_TNAME nerv_matrix_cuda_double_tname const char *nerv_matrix_(tname) = "nerv.MMatrixDouble"; #include "generic/mmatrix.c" #undef nerv_matrix_ |