aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQi Liu <liuq901@163.com>2016-03-31 16:48:07 +0800
committerQi Liu <liuq901@163.com>2016-03-31 16:48:07 +0800
commit78643f5127d86b54894f46a64d9593cdf6048d51 (patch)
tree1d23aed762a8783c9bba3461915357f23c2c164d
parent9b2fa6b357d441afbd6ccf41b9e039f5dc34eb05 (diff)
update general trainer
-rw-r--r--nerv/Makefile2
-rw-r--r--nerv/examples/trainer.lua2
-rw-r--r--nerv/nn/init.lua1
-rw-r--r--nerv/nn/trainer.lua (renamed from nerv/examples/trainer_class.lua)0
4 files changed, 2 insertions, 3 deletions
diff --git a/nerv/Makefile b/nerv/Makefile
index a5e4f66..dde8fe7 100644
--- a/nerv/Makefile
+++ b/nerv/Makefile
@@ -43,7 +43,7 @@ LUA_LIBS := matrix/init.lua io/init.lua init.lua \
layer/window.lua layer/bias.lua layer/combiner.lua layer/mse.lua \
layer/elem_mul.lua layer/lstm.lua layer/lstm_gate.lua layer/dropout.lua layer/gru.lua \
layer/graph.lua layer/rnn.lua layer/duplicate.lua layer/identity.lua \
- nn/init.lua nn/layer_repo.lua nn/param_repo.lua nn/network.lua \
+ nn/init.lua nn/layer_repo.lua nn/param_repo.lua nn/network.lua nn/trainer.lua\
io/frm_buffer.lua io/seq_buffer.lua
INCLUDE := -I $(LUA_INCDIR) -DLUA_USE_APICHECK
diff --git a/nerv/examples/trainer.lua b/nerv/examples/trainer.lua
index b691f5b..7af628e 100644
--- a/nerv/examples/trainer.lua
+++ b/nerv/examples/trainer.lua
@@ -1,5 +1,3 @@
-nerv.include('trainer_class.lua')
-
require 'lfs'
require 'pl'
diff --git a/nerv/nn/init.lua b/nerv/nn/init.lua
index 1037d05..34b05cf 100644
--- a/nerv/nn/init.lua
+++ b/nerv/nn/init.lua
@@ -1,3 +1,4 @@
nerv.include('layer_repo.lua')
nerv.include('param_repo.lua')
nerv.include('network.lua')
+nerv.include('trainer.lua')
diff --git a/nerv/examples/trainer_class.lua b/nerv/nn/trainer.lua
index 4ae08d9..4ae08d9 100644
--- a/nerv/examples/trainer_class.lua
+++ b/nerv/nn/trainer.lua