diff options
author | Soumith Chintala <soumith@gmail.com> | 2016-02-13 03:49:19 +0300 |
---|---|---|
committer | Soumith Chintala <soumith@gmail.com> | 2016-02-13 03:49:19 +0300 |
commit | ccc9627a95972eca32915100ceddddcfe6e87f43 (patch) | |
tree | ee8f97c500409798471dc446314c40c19daf1720 | |
parent | 52ba96bc4c3886170c81dc404fa6335566bfa73d (diff) | |
parent | cf2c747d3a4df3df362c5003211c9a6d9e7ce8c2 (diff) |
Merge pull request #101 from torch/require
include and paths.dofile -> require
-rw-r--r-- | gmodule.lua | 4 | ||||
-rw-r--r-- | init.lua | 18 | ||||
-rw-r--r-- | nesting.lua | 2 | ||||
-rw-r--r-- | node.lua | 2 |
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 @@ -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. @@ -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 |