include -> require

1 files changed, 38 insertions, 38 deletions

diff --git a/init.lua b/init.lua
index 5c8d1b9..719ad11 100644
--- a/init.lua
+++ b/init.lua
@@ -36,53 +36,53 @@ nnx = {}
 require 'libnnx'
 
 -- for testing:
-torch.include('nnx', 'test-all.lua')
-torch.include('nnx', 'test-omp.lua')
+require('nnx.test-all')
+require('nnx.test-omp')
 
 -- tools:
-torch.include('nnx', 'Probe.lua')
-torch.include('nnx', 'Tic.lua')
-torch.include('nnx', 'Toc.lua')
+require('nnx.Probe')
+require('nnx.Tic')
+require('nnx.Toc')
 
 -- spatial (images) operators:
-torch.include('nnx', 'SpatialLinear.lua')
-torch.include('nnx', 'SpatialClassifier.lua')
-torch.include('nnx', 'SpatialNormalization.lua')
-torch.include('nnx', 'SpatialPadding.lua')
-torch.include('nnx', 'SpatialReSamplingEx.lua')
-torch.include('nnx', 'SpatialUpSampling.lua')
-torch.include('nnx', 'SpatialDownSampling.lua')
-torch.include('nnx', 'SpatialReSampling.lua')
-torch.include('nnx', 'SpatialRecursiveFovea.lua')
-torch.include('nnx', 'SpatialFovea.lua')
-torch.include('nnx', 'SpatialPyramid.lua')
-torch.include('nnx', 'SpatialGraph.lua')
-torch.include('nnx', 'SpatialMatching.lua')
-torch.include('nnx', 'SpatialRadialMatching.lua')
-torch.include('nnx', 'SpatialMaxSampling.lua')
-torch.include('nnx', 'SpatialColorTransform.lua')
+require('nnx.SpatialLinear')
+require('nnx.SpatialClassifier')
+require('nnx.SpatialNormalization')
+require('nnx.SpatialPadding')
+require('nnx.SpatialReSamplingEx')
+require('nnx.SpatialUpSampling')
+require('nnx.SpatialDownSampling')
+require('nnx.SpatialReSampling')
+require('nnx.SpatialRecursiveFovea')
+require('nnx.SpatialFovea')
+require('nnx.SpatialPyramid')
+require('nnx.SpatialGraph')
+require('nnx.SpatialMatching')
+require('nnx.SpatialRadialMatching')
+require('nnx.SpatialMaxSampling')
+require('nnx.SpatialColorTransform')
 
 -- other modules
-torch.include('nnx', 'FunctionWrapper.lua')
+require('nnx.FunctionWrapper')
 
 -- misc
-torch.include('nnx', 'SaturatedLU.lua')
-torch.include('nnx', 'Minus.lua')
-torch.include('nnx', 'SoftMaxTree.lua')
-torch.include('nnx', 'MultiSoftMax.lua')
-torch.include('nnx', 'Balance.lua')
-torch.include('nnx', 'PushTable.lua')
-torch.include('nnx', 'PullTable.lua')
-torch.include('nnx', 'ZeroGrad.lua')
+require('nnx.SaturatedLU')
+require('nnx.Minus')
+require('nnx.SoftMaxTree')
+require('nnx.MultiSoftMax')
+require('nnx.Balance')
+require('nnx.PushTable')
+require('nnx.PullTable')
+require('nnx.ZeroGrad')
 
 -- criterions:
-torch.include('nnx', 'SuperCriterion.lua')
-torch.include('nnx', 'DistNLLCriterion.lua')
-torch.include('nnx', 'DistMarginCriterion.lua')
-torch.include('nnx', 'TreeNLLCriterion.lua')
+require('nnx.SuperCriterion')
+require('nnx.DistNLLCriterion')
+require('nnx.DistMarginCriterion')
+require('nnx.TreeNLLCriterion')
 
 -- datasets:
-torch.include('nnx', 'DataSet.lua')
-torch.include('nnx', 'DataList.lua')
-torch.include('nnx', 'DataSetLabelMe.lua')
-torch.include('nnx', 'DataSetSamplingPascal.lua')
+require('nnx.DataSet')
+require('nnx.DataList')
+require('nnx.DataSetLabelMe')
+require('nnx.DataSetSamplingPascal')