diff options
| author | Páidí Creed <paidi@swiftkey.net> | 2013-11-06 19:15:28 +0400 |
|---|---|---|
| committer | Páidí Creed <paidi@swiftkey.net> | 2013-11-06 19:15:28 +0400 |
| commit | aa60b6e2be23beb899b3eca28c762793afea52a6 (patch) | |
| tree | 17584525dd35143c4aec254269da571ff1def87b /init.lua | |
| parent | d1c7da6a9f760c31a1b27477e27b124e84d556ab (diff) | |
| parent | b8f17d4136410b80bf621ff660abb8ab1ed7bf5e (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
extra/nn/test/test.lua
Diffstat (limited to 'init.lua')
| -rw-r--r-- | init.lua | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -75,6 +75,7 @@ include('SpatialContrastiveNormalization.lua') include('SpatialZeroPadding.lua') include('VolumetricConvolution.lua') +include('VolumetricMaxPooling.lua') include('ParallelTable.lua') include('ConcatTable.lua') |