diff options
| author | Qi Liu <liuq901@163.com> | 2016-05-12 17:41:21 +0800 |
|---|---|---|
| committer | Qi Liu <liuq901@163.com> | 2016-05-12 17:41:21 +0800 |
| commit | c0fdb7ee2966546023410bb03e62dee0cf64e0e1 (patch) | |
| tree | cd90688b8aee2991a78f971e1bc4e0e9596e357b /nerv/Makefile | |
| parent | d88a57f4852c50a2678de950ee650ed9b6a895f0 (diff) | |
| parent | 10916f721a945a5edd052ab93027413fd3c01f65 (diff) | |
Merge branch 'master' into 'master'
beta-1.2
multiple change
1. Merge affine & lstm_gate & projection layer
2. Change clip behavior
3. Seq_buffer support sequence level shuffle
4. LSTM & LSTMP layer support multiple input
See merge request !4
Diffstat (limited to 'nerv/Makefile')
| -rw-r--r-- | nerv/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nerv/Makefile b/nerv/Makefile index 0d9934a..a3d0f34 100644 --- a/nerv/Makefile +++ b/nerv/Makefile @@ -40,9 +40,9 @@ OBJS := $(CORE_OBJS) $(NERV_OBJS) $(LUAT_OBJS) LIBS := $(INST_LIBDIR)/libnerv.so $(LIB_PATH)/libnervcore.so $(LIB_PATH)/libluaT.so LUA_LIBS := matrix/init.lua io/init.lua init.lua \ layer/init.lua layer/affine.lua layer/sigmoid.lua layer/tanh.lua layer/softmax_ce.lua layer/softmax.lua \ - layer/lstmp.lua layer/projection.lua layer/relu.lua\ + layer/lstmp.lua layer/relu.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/elem_mul.lua layer/lstm.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/trainer.lua\ io/frm_buffer.lua io/seq_buffer.lua |