Merge branch 'master' of https://github.com/liuq901/nerv into liuq901-master

Conflicts:
	nerv/layer/init.lua
	nerv/nn/layer_repo.lua

1 files changed, 38 insertions, 0 deletions

diff --git a/nerv/layer/rnn.lua b/nerv/layer/rnn.lua
new file mode 100644
index 0000000..e59cf5b
--- /dev/null
+++ b/nerv/layer/rnn.lua
@@ -0,0 +1,38 @@
+local RNNLayer = nerv.class('nerv.RNNLayer', 'nerv.GraphLayer')
+
+function RNNLayer:__init(id, global_conf, layer_conf)
+    nerv.Layer.__init(self, id, global_conf, layer_conf)
+    self:check_dim_len(1, 1)
+
+    local din = layer_conf.dim_in[1]
+    local dout = layer_conf.dim_out[1]
+
+    local pr = layer_conf.pr
+    if pr == nil then
+        pr = nerv.ParamRepo({}, self.loc_type)
+    end
+
+    local layers = {
+        ['nerv.AffineLayer'] = {
+            main = {dim_in = {din, dout}, dim_out = {dout}, pr = pr},
+        },
+        ['nerv.SigmoidLayer'] = {
+            sigmoid = {dim_in = {dout}, dim_out = {dout}},
+        },
+        ['nerv.DuplicateLayer'] = {
+            dup = {dim_in = {dout}, dim_out = {dout, dout}},
+        }
+    }
+
+    local connections = {
+        {'<input>[1]', 'main[1]', 0},
+        {'main[1]', 'sigmoid[1]', 0},
+        {'sigmoid[1]', 'dup[1]', 0},
+        {'dup[1]', 'main[2]', 1},
+        {'dup[2]', '<output>[1]', 0},
+    }
+
+    self:add_prefix(layers, connections)
+    local layer_repo = nerv.LayerRepo(layers, pr, global_conf)
+    self:graph_init(layer_repo, connections)
+end