diff options
author | Determinant <[email protected]> | 2016-04-18 12:38:25 +0800 |
---|---|---|
committer | Determinant <[email protected]> | 2016-04-18 12:38:25 +0800 |
commit | c73636ba680cdb5b57602a1876a75c110b43d426 (patch) | |
tree | 25a36588f066bfb850c5d0a81c5c40f01b8def56 /nerv/matrix | |
parent | b15dbc05b08008327b88a62d7f90ef9250182e9b (diff) |
support SeqBuffer decoding; fix bugs in finding paramsalpha-4
Diffstat (limited to 'nerv/matrix')
-rw-r--r-- | nerv/matrix/generic/cumatrix.c | 23 | ||||
-rw-r--r-- | nerv/matrix/generic/matrix.c | 23 | ||||
-rw-r--r-- | nerv/matrix/generic/mmatrix.c | 2 |
3 files changed, 25 insertions, 23 deletions
diff --git a/nerv/matrix/generic/cumatrix.c b/nerv/matrix/generic/cumatrix.c index 9577fd5..540afd2 100644 --- a/nerv/matrix/generic/cumatrix.c +++ b/nerv/matrix/generic/cumatrix.c @@ -51,29 +51,6 @@ static int nerv_matrix_(lua_rand_uniform)(lua_State *L) { return 0; } -static int nerv_matrix_(lua_tanh)(lua_State *L) { - Status status; - MATRIX_CONTEXT *context; - MATRIX_GET_CONTEXT(L, 3); - Matrix *a = luaT_checkudata(L, 1, nerv_matrix_(tname)); - Matrix *b = luaT_checkudata(L, 2, nerv_matrix_(tname)); - nerv_matrix_(tanh)(a, b, context, &status); - NERV_LUA_CHECK_STATUS(L, status); - return 0; -} - -static int nerv_matrix_(lua_tanh_grad)(lua_State *L) { - Status status; - MATRIX_CONTEXT *context; - MATRIX_GET_CONTEXT(L, 4); - 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, context, &status); - NERV_LUA_CHECK_STATUS(L, status); - return 0; -} - extern const char *MATRIX_CUMATRIX_HOST_TNAME; static int nerv_matrix_(lua_copy_fromh)(lua_State *L) { Status status; diff --git a/nerv/matrix/generic/matrix.c b/nerv/matrix/generic/matrix.c index 3e91933..800408d 100644 --- a/nerv/matrix/generic/matrix.c +++ b/nerv/matrix/generic/matrix.c @@ -407,4 +407,27 @@ static int nerv_matrix_(lua_set_values_by_mask)(lua_State *L) { return 0; } +static int nerv_matrix_(lua_tanh)(lua_State *L) { + Status status; + MATRIX_CONTEXT *context; + MATRIX_GET_CONTEXT(L, 3); + Matrix *a = luaT_checkudata(L, 1, nerv_matrix_(tname)); + Matrix *b = luaT_checkudata(L, 2, nerv_matrix_(tname)); + nerv_matrix_(tanh)(a, b, context, &status); + NERV_LUA_CHECK_STATUS(L, status); + return 0; +} + +static int nerv_matrix_(lua_tanh_grad)(lua_State *L) { + Status status; + MATRIX_CONTEXT *context; + MATRIX_GET_CONTEXT(L, 4); + 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, context, &status); + NERV_LUA_CHECK_STATUS(L, status); + return 0; +} + #endif diff --git a/nerv/matrix/generic/mmatrix.c b/nerv/matrix/generic/mmatrix.c index de1eaa3..c03aee4 100644 --- a/nerv/matrix/generic/mmatrix.c +++ b/nerv/matrix/generic/mmatrix.c @@ -120,6 +120,8 @@ static const luaL_Reg nerv_matrix_(extra_methods)[] = { {"set_values_by_mask", nerv_matrix_(lua_set_values_by_mask)}, {"sigmoid", nerv_matrix_(lua_sigmoid)}, {"sigmoid_grad", nerv_matrix_(lua_sigmoid_grad)}, + {"tanh", nerv_matrix_(lua_tanh)}, + {"tanh_grad", nerv_matrix_(lua_tanh_grad)}, {"softmax", nerv_matrix_(lua_softmax)}, {"mul_elem", nerv_matrix_(lua_mul_elem)}, {"log_elem", nerv_matrix_(lua_log_elem)}, |