diff options
author | Clement Farabet <clement.farabet@gmail.com> | 2011-11-11 19:38:11 +0400 |
---|---|---|
committer | Clement Farabet <clement.farabet@gmail.com> | 2011-11-11 19:38:11 +0400 |
commit | 98fb40a126afb2f33800af2f081d3119a8b55448 (patch) | |
tree | b811fd62ac82766bc9d1a49f4d9e99cdc52ec8fa /Type.lua | |
parent | a8ab27537e16f4440565fbebe6313b2172b489a1 (diff) |
Upgraded all code to new torch master.torch-master
Diffstat (limited to 'Type.lua')
-rw-r--r-- | Type.lua | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -18,24 +18,24 @@ function Type:add(module) return self end -function Type:forward(input) - input = self.convert_input:forward(input) - local output = parent.forward(self, input) - self.output = self.convert_output:forward(output) +function Type:updateOutput(input) + input = self.convert_input:updateOutput(input) + local output = parent.updateOutput(self, input) + self.output = self.convert_output:updateOutput(output) return self.output end -function Type:backward(input, gradOutput) - input = self.convert_input:forward(input) - gradOutput = self.convert_gradOutput:forward(gradOutput) - local gradInput = parent.backward(self, input, gradOutput) - self.gradInput = self.convert_gradInput:forward(gradInput) +function Type:updateGradInput(input, gradOutput) + input = self.convert_input:updateOutput(input) + gradOutput = self.convert_gradOutput:updateOutput(gradOutput) + local gradInput = parent.updateGradInput(self, input, gradOutput) + self.gradInput = self.convert_gradInput:updateOutput(gradInput) return self.gradInput end function Type:accGradParameters(input, gradOutput) - input = self.convert_input:forward(input) - gradOutput = self.convert_gradOutput:forward(gradOutput) + input = self.convert_input:updateOutput(input) + gradOutput = self.convert_gradOutput:updateOutput(gradOutput) parent.accGradParameters(self, input, gradOutput) end |