4 files changed, 29 insertions, 1 deletions
diff --git a/nerv/matrix/generic/cumatrix.c b/nerv/matrix/generic/cumatrix.c
index 00e4ee3..0c90d39 100644
--- a/nerv/matrix/generic/cumatrix.c
+++ b/nerv/matrix/generic/cumatrix.c
@@ -267,6 +267,7 @@ static const luaL_Reg nerv_matrix_(extra_methods)[] = {
     {"scale_rows_by_row", nerv_matrix_(lua_scale_rows_by_row)},
     {"scale_rows_by_col", nerv_matrix_(lua_scale_rows_by_col)},
     {"prefixsum_row", nerv_matrix_(lua_prefixsum_row)},
+    {"diagonalize", nerv_matrix_(lua_diagonalize)},
 #ifdef __NERV_FUTURE_CUDA_7
     {"update_select_rows_by_rowidx", nerv_matrix_(lua_update_select_rows_by_rowidx)},
     {"update_select_rows_by_colidx", nerv_matrix_(lua_update_select_rows_by_colidx)},
diff --git a/nerv/matrix/generic/matrix.c b/nerv/matrix/generic/matrix.c
index 8c2f871..fe07585 100644
--- a/nerv/matrix/generic/matrix.c
+++ b/nerv/matrix/generic/matrix.c
@@ -385,4 +385,14 @@ static int nerv_matrix_(lua_scale_rows_by_row)(lua_State *L) {
     return 0;
 }
 
+static int nerv_matrix_(lua_diagonalize)(lua_State *L) {
+    Status status;
+    MATRIX_CONTEXT *context;
+    MATRIX_GET_CONTEXT(L, 2);
+    Matrix *a = luaT_checkudata(L, 1, nerv_matrix_(tname));
+    nerv_matrix_(diagonalize)(a, 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 1f37173..a5e5969 100644
--- a/nerv/matrix/generic/mmatrix.c
+++ b/nerv/matrix/generic/mmatrix.c
@@ -116,6 +116,7 @@ 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)},
+    {"diagonalize", nerv_matrix_(lua_diagonalize)},
     {"sigmoid", nerv_matrix_(lua_sigmoid)},
     {"sigmoid_grad", nerv_matrix_(lua_sigmoid_grad)},
     {"softmax", nerv_matrix_(lua_softmax)},
diff --git a/nerv/matrix/init.lua b/nerv/matrix/init.lua
index cf85004..722c780 100644
--- a/nerv/matrix/init.lua
+++ b/nerv/matrix/init.lua
@@ -40,7 +40,8 @@ end
 --- Assign each element in a matrix using the value returned by a callback `gen`.
 -- @param gen the callback used to generated the values in the matrix, to which
 -- the indices of row and column will be passed (e.g., `gen(i, j)`)
-function nerv.Matrix:generate(gen)
+
+function nerv.Matrix:_generate(gen)
     if (self:dim() == 2) then
         for i = 0, self:nrow() - 1 do
             local row = self[i]
@@ -55,6 +56,21 @@ function nerv.Matrix:generate(gen)
     end
 end
 
+function nerv.Matrix:generate(gen)
+    local tmp
+    if nerv.is_type(self, 'nerv.CuMatrixFloat') then
+        tmp = nerv.MMatrixFloat(self:nrow(), self:ncol())
+    elseif nerv.is_type(self, 'nerv.CuMatrixDouble') then
+        tmp = nerv.MMatrixDouble(self:nrow(), self:ncol())
+    else
+        tmp = self
+    end
+    tmp:_generate(gen)
+    if nerv.is_type(self, 'nerv.CuMatrix') then
+        self:copy_fromh(tmp)
+    end
+end
+
 --- Create a fresh new matrix of the same matrix type (as `self`).
 -- @param nrow optional, the number of rows in the created matrix if specified,
 -- otherwise `self:nrow()` will be used