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, 12 insertions, 0 deletions

diff --git a/nerv/layer/init.lua b/nerv/layer/init.lua
index 146ad8c..475ef62 100644
--- a/nerv/layer/init.lua
+++ b/nerv/layer/init.lua
@@ -85,6 +85,14 @@ function Layer:get_dim()
     return self.dim_in, self.dim_out
 end
 
+function Layer:set_attr(name, value)
+    self[name] = value
+end
+
+function Layer:get_sublayer(id)
+    nerv.error('primitive layer does not have sublayers')
+end
+
 function Layer:find_param(plist, lconf, gconf, p_type, p_dim)
     if type(plist) == "string" then
         plist = {plist}
@@ -119,6 +127,7 @@ function Layer:find_param(plist, lconf, gconf, p_type, p_dim)
     return p
 end
 
+nerv.include('graph.lua')
 nerv.include('affine.lua')
 nerv.include('sigmoid.lua')
 nerv.include('tanh.lua')
@@ -133,6 +142,9 @@ nerv.include('lstm.lua')
 nerv.include('lstm_gate.lua')
 nerv.include('dropout.lua')
 nerv.include('gru.lua')
+nerv.include('rnn.lua')
+nerv.include('duplicate.lua')
+nerv.include('identity.lua')
 
 -- The following lines are for backward compatibility, and will be removed in
 -- the future. The use of these names are deprecated.