diff options
author | Determinant <[email protected]> | 2016-03-11 13:59:46 +0800 |
---|---|---|
committer | Determinant <[email protected]> | 2016-03-11 13:59:46 +0800 |
commit | e6d28de460dfd06d696d369119247179c7a7525d (patch) | |
tree | 6263fb1555ddcba962edc31ee1312679135c06c4 /nerv/Makefile | |
parent | a32195e3e2ae9ca0f0c7a82e73e6bddb64568c05 (diff) | |
parent | f26288ba61d3d16866e1b227a71e7d9c46923436 (diff) |
Merge branch 'master' of https://github.com/liuq901/nerv into liuq901-master
Conflicts:
nerv/layer/init.lua
nerv/nn/layer_repo.lua
Diffstat (limited to 'nerv/Makefile')
-rw-r--r-- | nerv/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nerv/Makefile b/nerv/Makefile index e8bcad2..421eda0 100644 --- a/nerv/Makefile +++ b/nerv/Makefile @@ -42,7 +42,8 @@ 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/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 \ - nn/init.lua nn/layer_repo.lua nn/param_repo.lua nn/layer_dag.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/layer_dag.lua nn/network.lua \ io/sgd_buffer.lua \ tnn/init.lua tnn/sutil.lua tnn/tnn.lua |