diff options
| author | Ronan Collobert <ronan@collobert.com> | 2012-05-17 02:40:02 +0400 |
|---|---|---|
| committer | Ronan Collobert <ronan@collobert.com> | 2012-05-17 02:40:02 +0400 |
| commit | 4ec6dec431c8523de7282ec3fdbbc6dd2d3cc243 (patch) | |
| tree | f4bd0ed6a88944200cb6908d7186f47725888d44 /init.lua | |
| parent | 47f14c71716f8e38f310d29c819e355698a75377 (diff) | |
| parent | 0ef82918f098b08e6a06b974c64b043bc461a62f (diff) | |
Merge branch 'master' into mergeopenmp
Conflicts:
extra/openmp/pkg/openmp/generic/SpatialMaxPoolingOmp.c
extra/openmp/pkg/openmp/generic/SpatialSubSamplingOmp.c
extra/openmp/pkg/openmp/generic/SqrtOmp.c
extra/openmp/pkg/openmp/generic/SquareOmp.c
Diffstat (limited to 'init.lua')
| -rw-r--r-- | init.lua | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -35,6 +35,7 @@ torch.include('nn', 'CosineDistance.lua') torch.include('nn', 'DotProduct.lua') torch.include('nn', 'Exp.lua') +torch.include('nn', 'Log.lua') torch.include('nn', 'HardTanh.lua') torch.include('nn', 'LogSigmoid.lua') torch.include('nn', 'LogSoftMax.lua') @@ -61,6 +62,8 @@ torch.include('nn', 'SpatialLPPooling.lua') torch.include('nn', 'TemporalConvolution.lua') torch.include('nn', 'TemporalSubSampling.lua') torch.include('nn', 'SpatialSubtractiveNormalization.lua') +torch.include('nn', 'SpatialDivisiveNormalization.lua') +torch.include('nn', 'SpatialContrastiveNormalization.lua') torch.include('nn', 'SpatialZeroPadding.lua') torch.include('nn', 'VolumetricConvolution.lua') @@ -77,6 +80,7 @@ torch.include('nn', 'MSECriterion.lua') torch.include('nn', 'MarginCriterion.lua') torch.include('nn', 'AbsCriterion.lua') torch.include('nn', 'ClassNLLCriterion.lua') +torch.include('nn', 'DistKLDivCriterion.lua') torch.include('nn', 'MultiCriterion.lua') torch.include('nn', 'L1HingeEmbeddingCriterion.lua') torch.include('nn', 'HingeEmbeddingCriterion.lua') |