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/lib/matrix/mmatrix.c | |
| parent | dcad8a3f80fc55ca93984d981f9b829d2e4ea728 (diff) | |
try a basic merge
Diffstat (limited to 'nerv/lib/matrix/mmatrix.c')
| -rw-r--r-- | nerv/lib/matrix/mmatrix.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/nerv/lib/matrix/mmatrix.c b/nerv/lib/matrix/mmatrix.c index b5670f2..3125ab6 100644 --- a/nerv/lib/matrix/mmatrix.c +++ b/nerv/lib/matrix/mmatrix.c @@ -5,6 +5,7 @@ #define MATRIX_USE_FLOAT #define host_matrix_(NAME) host_matrix_float_##NAME #define nerv_matrix_(NAME) nerv_matrix_host_float_##NAME +#define NERV_CBLAS_(NAME) cblas_s##NAME #include "generic/matrix.h" #include "generic/elem_type.h" #include "generic/mmatrix.c" @@ -29,6 +30,7 @@ Matrix *nerv_matrix_(perm_gen)(int ncol, Status *status) { #undef nerv_matrix_ #undef host_matrix_ +#undef NERV_CBLAS_ #undef MATRIX_USE_FLOAT #undef MATRIX_ELEM #undef MATRIX_ELEM_PTR @@ -40,9 +42,11 @@ Matrix *nerv_matrix_(perm_gen)(int ncol, Status *status) { #define MATRIX_USE_DOUBLE #define host_matrix_(NAME) host_matrix_double_##NAME #define nerv_matrix_(NAME) nerv_matrix_host_double_##NAME +#define NERV_CBLAS_(NAME) cblas_d##NAME #include "generic/mmatrix.c" #undef nerv_matrix_ #undef host_matrix_ +#undef NERV_CBLAS_ #undef MATRIX_USE_DOUBLE #undef MATRIX_ELEM #undef MATRIX_ELEM_PTR @@ -54,4 +58,5 @@ Matrix *nerv_matrix_(perm_gen)(int ncol, Status *status) { #define MATRIX_USE_INT #define host_matrix_(NAME) host_matrix_int_##NAME #define nerv_matrix_(NAME) nerv_matrix_host_int_##NAME +#define NERV_CBLAS_(NAME) (void) #include "generic/mmatrix.c" |