diff options
| author | txh18 <[email protected]> | 2015-11-23 15:54:20 +0800 |
|---|---|---|
| committer | txh18 <[email protected]> | 2015-11-23 15:54:20 +0800 |
| commit | e76ae9b12651ed8497537edf357f4cf90421ea0d (patch) | |
| tree | 6a305444219a041ce953a3323e4d5449e335b218 /nerv/lib/matrix/generic/cumatrix.c | |
| parent | 979473dcc890a92fb90b470b924d1e1e70f6dbc0 (diff) | |
| parent | ec6bde79a5817409bb8a77075b411974c1d8f856 (diff) | |
merge in recent changes about param updates
Merge branch 'master' into txh18/rnnlm
Diffstat (limited to 'nerv/lib/matrix/generic/cumatrix.c')
| -rw-r--r-- | nerv/lib/matrix/generic/cumatrix.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nerv/lib/matrix/generic/cumatrix.c b/nerv/lib/matrix/generic/cumatrix.c index 2dc5899..00af895 100644 --- a/nerv/lib/matrix/generic/cumatrix.c +++ b/nerv/lib/matrix/generic/cumatrix.c @@ -359,6 +359,7 @@ void nerv_matrix_(copy_rows_fromd_by_idx)(Matrix *a, const Matrix *b, NERV_SET_STATUS(status, NERV_NORMAL, 0); } +#ifdef __NERV_FUTURE_CUDA_7 void nerv_matrix_(update_select_rows)(Matrix *c, const Matrix *a, const Matrix *idx, double alpha, double beta, Status *status) { long nrow = a->nrow; if (idx->nrow != 1) @@ -370,6 +371,7 @@ void nerv_matrix_(update_select_rows)(Matrix *c, const Matrix *a, const Matrix * PROFILE_STOP NERV_SET_STATUS(status, NERV_NORMAL, 0); } +#endif void nerv_matrix_(expand_frm)(Matrix *a, const Matrix *b, int context, Status *status) { |