diff options
| author | Determinant <ted.sybil@gmail.com> | 2016-03-11 13:59:46 +0800 |
|---|---|---|
| committer | Determinant <ted.sybil@gmail.com> | 2016-03-11 13:59:46 +0800 |
| commit | e6d28de460dfd06d696d369119247179c7a7525d (patch) | |
| tree | 6263fb1555ddcba962edc31ee1312679135c06c4 /nerv/nn/init.lua | |
| 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/nn/init.lua')
| -rw-r--r-- | nerv/nn/init.lua | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nerv/nn/init.lua b/nerv/nn/init.lua index cbaf52b..c32ea09 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('layer_dag.lua') +nerv.include('network.lua') |