diff options
Diffstat (limited to 'init.lua')
| -rw-r--r-- | init.lua | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,9 +1,9 @@ ---------------------------------------------------------------------- -- --- Copyright (c) 2011 Clement Farabet, Marco Scoffier, +-- Copyright (c) 2011 Clement Farabet, Marco Scoffier, -- Koray Kavukcuoglu, Benoit Corda -- --- +-- -- Permission is hereby granted, free of charge, to any person obtaining -- a copy of this software and associated documentation files (the -- "Software"), to deal in the Software without restriction, including @@ -11,10 +11,10 @@ -- distribute, sublicense, and/or sell copies of the Software, and to -- permit persons to whom the Software is furnished to do so, subject to -- the following conditions: --- +-- -- The above copyright notice and this permission notice shall be -- included in all copies or substantial portions of the Software. --- +-- -- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -22,7 +22,7 @@ -- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- +-- ---------------------------------------------------------------------- require 'torch' @@ -69,6 +69,7 @@ require('nnx.FunctionWrapper') require('nnx.SaturatedLU') require('nnx.Minus') require('nnx.SoftMaxTree') +require('nnx.SoftMaxForest') require('nnx.MultiSoftMax') require('nnx.Balance') require('nnx.PushTable') |