moved tnn to main nerv dir and added it to Makefile

3 files changed, 111 insertions, 0 deletions

diff --git a/nerv/layer/elem_mul.lua b/nerv/layer/elem_mul.lua
new file mode 100644
index 0000000..c809d3e
--- /dev/null
+++ b/nerv/layer/elem_mul.lua
@@ -0,0 +1,38 @@
+local ElemMulLayer = nerv.class('nerv.ElemMulLayer', 'nerv.Layer')
+
+function ElemMulLayer:__init(id, global_conf, layer_conf)
+    self.id = id
+    self.dim_in = layer_conf.dim_in
+    self.dim_out = layer_conf.dim_out
+    self.gconf = global_conf
+ 
+    self:check_dim_len(2, 1) -- Element-multiply input[1] and input[2]
+end
+
+function ElemMulLayer:init(batch_size)
+    if self.dim_in[1] ~= self.dim_in[2] or 
+        self.dim_in[1] ~= self.dim_out[1] then
+        nerv.error("dim_in and dim_out mismatch for ElemMulLayer")
+    end
+end
+
+function ElemMulLayer:batch_resize(batch_size)
+    --do nothing
+end
+
+function ElemMulLayer:propagate(input, output)
+    output[1]:mul_elem(input[1], input[2])
+end
+
+function ElemMulLayer:back_propagate(bp_err, next_bp_err, input, output)
+    next_bp_err[1]:mul_elem(bp_err[1], input[2]) 
+    next_bp_err[2]:mul_elem(bp_err[1], input[1])
+end
+
+function ElemMulLayer:update(bp_err, input, output)
+    --do nothing
+end
+
+function ElemMulLayer:get_params()
+    return nerv.ParamRepo({})
+end
diff --git a/nerv/layer/gate_fff.lua b/nerv/layer/gate_fff.lua
new file mode 100644
index 0000000..751dde1
--- /dev/null
+++ b/nerv/layer/gate_fff.lua
@@ -0,0 +1,71 @@
+local GateFFFLayer = nerv.class('nerv.GateFFFLayer', 'nerv.Layer')
+
+function GateFFFLayer:__init(id, global_conf, layer_conf)
+    self.id = id
+    self.dim_in = layer_conf.dim_in
+    self.dim_out = layer_conf.dim_out
+    self.gconf = global_conf
+ 
+    self.ltp1 = self:find_param("ltp1", layer_conf, global_conf, nerv.LinearTransParam, {self.dim_in[1], self.dim_out[1]}) --layer_conf.ltp
+    self.ltp2 = self:find_param("ltp2", layer_conf, global_conf, nerv.LinearTransParam, {self.dim_in[2], self.dim_out[1]}) --layer_conf.ltp
+    self.ltp3 = self:find_param("ltp3", layer_conf, global_conf, nerv.LinearTransParam, {self.dim_in[3], self.dim_out[1]}) --layer_conf.ltp
+    self.bp = self:find_param("bp", layer_conf, global_conf, nerv.BiasParam, {1, self.dim_out[1]})--layer_conf.bp
+  
+    self:check_dim_len(3, 1) -- exactly one input and one output
+end
+
+function GateFFFLayer:init(batch_size)
+    if self.ltp1.trans:ncol() ~= self.bp.trans:ncol() or 
+        self.ltp2.trans:ncol() ~= self.bp.trans:ncol() or
+        self.ltp3.trans:ncol() ~= self.bp.trans:ncol() then
+        nerv.error("mismatching dimensions of linear transform and bias paramter")
+    end
+    if self.dim_in[1] ~= self.ltp1.trans:nrow() or
+        self.dim_in[2] ~= self.ltp2.trans:nrow() or
+        self.dim_in[3] ~= self.ltp3.trans:nrow() then
+        nerv.error("mismatching dimensions of linear transform parameter and input")
+    end
+    if self.dim_out[1] ~= self.ltp1.trans:ncol() then
+        nerv.error("mismatching dimensions of linear transform parameter and output")
+    end
+    self.ltp1:train_init()
+    self.ltp2:train_init()
+    self.ltp3:train_init()
+    self.bp:train_init()
+    self.err_bakm = self.gconf.cumat_type(batch_size, self.dim_out[1])
+end
+
+function GateFFFLayer:batch_resize(batch_size)
+    if self.err_m:nrow() ~= batch_size then
+        self.err_bakm = self.gconf.cumat_type(batch_size, self.dim_out[1])
+    end
+end
+
+function GateFFFLayer:propagate(input, output)
+    -- apply linear transform
+    output[1]:mul(input[1], self.ltp1.trans, 1.0, 0.0, 'N', 'N')
+    output[1]:mul(input[2], self.ltp2.trans, 1.0, 1.0, 'N', 'N')
+    output[1]:mul(input[3], self.ltp3.trans, 1.0, 1.0, 'N', 'N')
+    -- add bias
+    output[1]:add_row(self.bp.trans, 1.0)
+    output[1]:sigmoid(output[1])
+end
+
+function GateFFFLayer:back_propagate(bp_err, next_bp_err, input, output)
+    self.err_bakm:sigmoid_grad(bp_err[1], output[1])
+    next_bp_err[1]:mul(self.err_bakm, self.ltp1.trans, 1.0, 0.0, 'N', 'T')
+    next_bp_err[2]:mul(self.err_bakm, self.ltp2.trans, 1.0, 0.0, 'N', 'T')
+    next_bp_err[3]:mul(self.err_bakm, self.ltp3.trans, 1.0, 0.0, 'N', 'T')
+end
+
+function GateFFFLayer:update(bp_err, input, output)
+    self.err_bakm:sigmoid_grad(bp_err[1], output[1])
+    self.ltp1:update_by_err_input(self.err_bakm, input[1])
+    self.ltp2:update_by_err_input(self.err_bakm, input[2])
+    self.ltp3:update_by_err_input(self.err_bakm, input[3])
+    self.bp:update_by_gradient(self.err_bakm:colsum())
+end
+
+function GateFFFLayer:get_params()
+    return nerv.ParamRepo({self.ltp1, self.ltp2, self.ltp3, self.bp})
+end
diff --git a/nerv/layer/init.lua b/nerv/layer/init.lua
index 32b82d8..23606e1 100644
--- a/nerv/layer/init.lua
+++ b/nerv/layer/init.lua
@@ -100,3 +100,5 @@ nerv.include('mse.lua')
 nerv.include('combiner.lua')
 nerv.include('affine_recurrent.lua')
 nerv.include('softmax.lua')
+nerv.include('elem_mul.lua')
+nerv.include('gate_fff.lua')