Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/nn.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsoumith <soumith@fb.com>2015-01-03 07:45:04 +0300
committersoumith <soumith@fb.com>2015-01-03 07:45:04 +0300
commit1efff4dc0b0bd396be618c352a9d6941a2f7b8b4 (patch)
tree412418951bfbf5174bff2fa99eb1f48f0b71ac1e /Parallel.lua
parenta38407a57def785acc819066db70f1649da47f03 (diff)
refactoring all the common container code into nn.Container
Diffstat (limited to 'Parallel.lua')
-rw-r--r--Parallel.lua41
1 files changed, 1 insertions, 40 deletions
diff --git a/Parallel.lua b/Parallel.lua
index 3057ba2..ef42723 100644
--- a/Parallel.lua
+++ b/Parallel.lua
@@ -1,4 +1,4 @@
-local Parallel, parent = torch.class('nn.Parallel', 'nn.Module')
+local Parallel, parent = torch.class('nn.Parallel', 'nn.Container')
function Parallel:__init(inputDimension,outputDimension)
parent.__init(self)
@@ -8,15 +8,6 @@ function Parallel:__init(inputDimension,outputDimension)
self.outputDimension = outputDimension
end
-function Parallel:add(module)
- table.insert(self.modules, module)
- return self
-end
-
-function Parallel:get(index)
- return self.modules[index]
-end
-
function Parallel:updateOutput(input)
local modules=input:size(self.inputDimension)
@@ -99,36 +90,6 @@ function Parallel:accUpdateGradParameters(input, gradOutput, lr)
end
end
-function Parallel:zeroGradParameters()
- for _,module in ipairs(self.modules) do
- module:zeroGradParameters()
- end
-end
-
-function Parallel:updateParameters(learningRate)
- for _,module in ipairs(self.modules) do
- module:updateParameters(learningRate)
- end
-end
-
-function Parallel:training()
- for i=1,#self.modules do
- self.modules[i]:training()
- end
-end
-
-function Parallel:evaluate()
- for i=1,#self.modules do
- self.modules[i]:evaluate()
- end
-end
-
-function Parallel:share(mlp,...)
- for i=1,#self.modules do
- self.modules[i]:share(mlp.modules[i],...);
- end
-end
-
function Parallel:parameters()
local function tinsert(to, from)
if type(from) == 'table' then