include and paths.dofile -> requirerequire

4 files changed, 13 insertions, 13 deletions

diff --git a/gmodule.lua b/gmodule.lua
index 9b2c0d7..2556b15 100644
--- a/gmodule.lua
+++ b/gmodule.lua
@@ -1,5 +1,5 @@
-local nesting = paths.dofile('nesting.lua')
-local utils = paths.dofile('utils.lua')
+local nesting = require('nngraph.nesting')
+local utils = require('nngraph.utils')
 local istensor = torch.isTensor
 local istable = utils.istable
 local istorchclass = utils.istorchclass
diff --git a/init.lua b/init.lua
index ac38c51..455e1b0 100644
--- a/init.lua
+++ b/init.lua
@@ -3,22 +3,22 @@ require 'graph'
 
 nngraph = {}
 
-torch.include('nngraph','nest.lua')
-torch.include('nngraph','node.lua')
-torch.include('nngraph','gmodule.lua')
-torch.include('nngraph','graphinspecting.lua')
-torch.include('nngraph','JustElement.lua')
-torch.include('nngraph','JustTable.lua')
-torch.include('nngraph','ModuleFromCriterion.lua')
+require('nngraph.nest')
+require('nngraph.node')
+require('nngraph.gmodule')
+require('nngraph.graphinspecting')
+require('nngraph.JustElement')
+require('nngraph.JustTable')
+require('nngraph.ModuleFromCriterion')
 
 -- handy functions
-local utils = paths.dofile('utils.lua')
+local utils = require('nngraph.utils')
 local istensor = torch.isTensor
 local istable = utils.istable
 local istorchclass = utils.istorchclass
 
 -- simpler todot functions
-nngraph.simple_print =  paths.dofile('simple_print.lua')
+nngraph.simple_print =  require('nngraph.simple_print')
 
 -- Modify the __call function to hack into nn.Module
 local Module = torch.getmetatable('nn.Module')
diff --git a/nesting.lua b/nesting.lua
index 4440797..f77f277 100644
--- a/nesting.lua
+++ b/nesting.lua
@@ -1,7 +1,7 @@
 
 local nesting = {}
 
-local utils = paths.dofile('utils.lua')
+local utils = require('nngraph.utils')
 local istensor = torch.isTensor
 
 -- Creates a clone of a tensor or of a table with tensors.
diff --git a/node.lua b/node.lua
index 93f35bc..b9cf87b 100644
--- a/node.lua
+++ b/node.lua
@@ -1,5 +1,5 @@
 
-local utils = paths.dofile('utils.lua')
+local utils = require('nngraph.utils')
 local istensor = torch.isTensor
 local istable = utils.istable
 local istorchclass = utils.istorchclass