From 2f97a8335984565a93ab170bd323e5e2a675b72a Mon Sep 17 00:00:00 2001 From: Xinwei He <1154646635@qq.com> Date: Tue, 6 Dec 2016 16:00:40 +0800 Subject: [PATCH 1/2] Update MyParallelCriterion.lua --- MyParallelCriterion.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MyParallelCriterion.lua b/MyParallelCriterion.lua index 2333235..3036132 100644 --- a/MyParallelCriterion.lua +++ b/MyParallelCriterion.lua @@ -12,8 +12,9 @@ end function RepeatedCriterion:updateOutput(input, target) self.output = 0 + if self.weights then self.weights = torch.ones(#input):div(#input) end for i = 1,#input do - self.output = self.output + self.weights[i]*criterion:updateOutput(input[i],target) + self.output = self.output + self.weights[i]*self.criterion:updateOutput(input[i],target) end return self.output end @@ -22,7 +23,7 @@ function RepeatedCriterion:updateGradInput(input, target) self.gradInput = nn.utils.recursiveResizeAs(self.gradInput, input) nn.utils.recursiveFill(self.gradInput, 0) for i = 1,#input do - nn.utils.recursiveAdd(self.gradInput[i], self.weights[i], criterion:updateGradInput(input[i], target)) + nn.utils.recursiveAdd(self.gradInput[i], self.weights[i], self.criterion:updateGradInput(input[i], target)) end return self.gradInput end From 544256b6489466f02fe2056488479f4e9ebd7320 Mon Sep 17 00:00:00 2001 From: Xinwei He <1154646635@qq.com> Date: Tue, 6 Dec 2016 16:02:10 +0800 Subject: [PATCH 2/2] Update MyParallelCriterion.lua --- MyParallelCriterion.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MyParallelCriterion.lua b/MyParallelCriterion.lua index 3036132..fa12ffa 100644 --- a/MyParallelCriterion.lua +++ b/MyParallelCriterion.lua @@ -12,7 +12,7 @@ end function RepeatedCriterion:updateOutput(input, target) self.output = 0 - if self.weights then self.weights = torch.ones(#input):div(#input) end + if self.weights == nil then self.weights = torch.ones(#input):div(#input) end for i = 1,#input do self.output = self.output + self.weights[i]*self.criterion:updateOutput(input[i],target) end