diff options
author | Determinant <ted.sybil@gmail.com> | 2016-06-08 14:37:21 +0800 |
---|---|---|
committer | Determinant <ted.sybil@gmail.com> | 2016-06-08 14:37:21 +0800 |
commit | 1d7af85c108d0e87b986db2dd23d524735a8b279 (patch) | |
tree | 24ba36d82f092390e133fce0eb0abe6647bb73e0 /nerv/layer/rnn.lua | |
parent | b7cdd5da65a3e4ae58ffcfdf74710cfb1ee6327f (diff) | |
parent | d58b7adf0acd68921ec2d38d5929bf68406d4982 (diff) |
Merge remote-tracking branch 'lab/master'
Diffstat (limited to 'nerv/layer/rnn.lua')
-rw-r--r-- | nerv/layer/rnn.lua | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/nerv/layer/rnn.lua b/nerv/layer/rnn.lua index fd6e753..8d5a07c 100644 --- a/nerv/layer/rnn.lua +++ b/nerv/layer/rnn.lua @@ -4,12 +4,7 @@ function RNNLayer:__init(id, global_conf, layer_conf) nerv.Layer.__init(self, id, global_conf, layer_conf) self:check_dim_len(-1, 1) if #self.dim_in == 0 then - nerv.error('RNN Layer %s has no input', self.id) - end - - self.activation = layer_conf.activation - if self.activation == nil then - self.activation = 'nerv.SigmoidLayer' + nerv.error('RNN layer %s has no input', self.id) end local din = layer_conf.dim_in @@ -22,10 +17,7 @@ function RNNLayer:__init(id, global_conf, layer_conf) local layers = { ['nerv.AffineLayer'] = { - main = {dim_in = table.connect({dout}, din), dim_out = {dout}, pr = pr}, - }, - [self.activation] = { - activation = {dim_in = {dout}, dim_out = {dout}}, + main = {dim_in = table.connect(din, {dout}), dim_out = {dout}, pr = pr, activation = layer_conf.activation}, }, ['nerv.DuplicateLayer'] = { duplicate = {dim_in = {dout}, dim_out = {dout, dout}}, @@ -33,13 +25,12 @@ function RNNLayer:__init(id, global_conf, layer_conf) } local connections = { - {'main[1]', 'activation[1]', 0}, - {'activation[1]', 'duplicate[1]', 0}, - {'duplicate[1]', 'main[1]', 1}, + {'main[1]', 'duplicate[1]', 0}, + {'duplicate[1]', 'main[' .. (#din + 1) .. ']', 1}, {'duplicate[2]', '<output>[1]', 0}, } for i = 1, #din do - table.insert(connections, {'<input>[' .. i .. ']', 'main[' .. (i + 1) .. ']', 0}) + table.insert(connections, {'<input>[' .. i .. ']', 'main[' .. i .. ']', 0}) end self:add_prefix(layers, connections) |