1 files changed, 50 insertions, 2 deletions

diff --git a/nerv/matrix/generic/cumatrix.c b/nerv/matrix/generic/cumatrix.c
index f675149..fb36033 100644
--- a/nerv/matrix/generic/cumatrix.c
+++ b/nerv/matrix/generic/cumatrix.c
@@ -62,6 +62,45 @@ static int nerv_matrix_(lua_sigmoid_grad)(lua_State *L) {
     return 0;
 }
 
+static int nerv_matrix_(lua_thres_mask)(lua_State *L) {
+    Status status;
+    Matrix *a = luaT_checkudata(L, 1, nerv_matrix_(tname));
+    Matrix *b = luaT_checkudata(L, 2, nerv_matrix_(tname));
+    MATRIX_ELEM thres = luaL_checknumber(L, 3);
+    MATRIX_ELEM low = luaL_checknumber(L, 4);
+    MATRIX_ELEM high = luaL_checknumber(L, 5);
+    nerv_matrix_(thres_mask)(a, b, thres, low, high, &status);
+    NERV_LUA_CHECK_STATUS(L, status);
+    return 0;
+}
+
+static int nerv_matrix_(lua_rand_uniform)(lua_State *L) {
+    Status status;
+    Matrix *a = luaT_checkudata(L, 1, nerv_matrix_(tname));
+    nerv_matrix_(rand_uniform)(a, &status);
+    NERV_LUA_CHECK_STATUS(L, status);
+    return 0;
+}
+
+static int nerv_matrix_(lua_tanh)(lua_State *L) {
+    Status status;
+    Matrix *a = luaT_checkudata(L, 1, nerv_matrix_(tname));
+    Matrix *b = luaT_checkudata(L, 2, nerv_matrix_(tname));
+    nerv_matrix_(tanh)(a, b, &status);
+    NERV_LUA_CHECK_STATUS(L, status);
+    return 0;
+}
+
+static int nerv_matrix_(lua_tanh_grad)(lua_State *L) {
+    Status status;
+    Matrix *nerr = luaT_checkudata(L, 1, nerv_matrix_(tname));
+    Matrix *err = luaT_checkudata(L, 2, nerv_matrix_(tname));
+    Matrix *output = luaT_checkudata(L, 3, nerv_matrix_(tname));
+    nerv_matrix_(tanh_grad)(nerr, err, output, &status);
+    NERV_LUA_CHECK_STATUS(L, status);
+    return 0;
+}
+
 static int nerv_matrix_(lua_softmax)(lua_State *L) {
     Status status;
     Matrix *a = luaT_checkudata(L, 2, nerv_matrix_(tname));
@@ -291,8 +330,10 @@ static int nerv_matrix_(lua_scale_rows_by_row)(lua_State *L) {
     return 0;
 }
 
+#ifdef __NERV_FUTURE_CUDA_7
 static int nerv_matrix_(lua_update_select_rows)(lua_State *L) {
-    //Update c's select rows, i.e. c[idx[i]] = c[idx[i]] * (1 - beta * alpha) + a[i] * alpha
+    /* update c's select rows,
+     * i.e. c[idx[i]] = c[idx[i]] * (1 - beta * alpha) + a[i] * alpha */
     Status status;
     Matrix *c = luaT_checkudata(L, 1, nerv_matrix_(tname));
     const Matrix *a = luaT_checkudata(L, 2, nerv_matrix_(tname));
@@ -303,6 +344,7 @@ static int nerv_matrix_(lua_update_select_rows)(lua_State *L) {
     NERV_LUA_CHECK_STATUS(L, status);
     return 0;
 }
+#endif
 
 static const luaL_Reg nerv_matrix_(extra_methods)[] = {
     {"colsum", nerv_matrix_(lua_colsum)},
@@ -323,18 +365,24 @@ static const luaL_Reg nerv_matrix_(extra_methods)[] = {
     {"add_row", nerv_matrix_(lua_add_row)},
     {"clip", nerv_matrix_(lua_clip)},
     {"fill", nerv_matrix_(lua_fill)},
-    {"update_select_rows", nerv_matrix_(lua_update_select_rows)},
     {"sigmoid", nerv_matrix_(lua_sigmoid)},
     {"sigmoid_grad", nerv_matrix_(lua_sigmoid_grad)},
+    {"tanh", nerv_matrix_(lua_tanh)},
+    {"tanh_grad", nerv_matrix_(lua_tanh_grad)},
+    {"rand_uniform", nerv_matrix_(lua_rand_uniform)},
     {"softmax", nerv_matrix_(lua_softmax)},
     {"mul_elem", nerv_matrix_(lua_mul_elem)},
     {"log_elem", nerv_matrix_(lua_log_elem)},
+    {"thres_mask", nerv_matrix_(lua_thres_mask)},
     {"copy_rows_fromh_by_idx", nerv_matrix_(lua_copy_rows_fromh_by_idx)},
     {"copy_rows_fromd_by_idx", nerv_matrix_(lua_copy_rows_fromd_by_idx)},
     {"expand_frm", nerv_matrix_(lua_expand_frm)},
     {"rearrange_frm", nerv_matrix_(lua_rearrange_frm)},
     {"scale_rows_by_row", nerv_matrix_(lua_scale_rows_by_row)},
     {"scale_rows_by_col", nerv_matrix_(lua_scale_rows_by_col)},
+#ifdef __NERV_FUTURE_CUDA_7
+    {"update_select_rows", nerv_matrix_(lua_update_select_rows)},
+#endif
     {NULL, NULL}
 };