Merge pull request torch#296 from fmassa/conv_fix

Fix print and correct non-contiguous test in SpatialConvolutionMM
mys007 · Jun 19, 2015 · c293e84 · c293e84
2 parents a98f4b8 + cc37251
commit c293e84
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/SpatialConvolution.lua b/SpatialConvolution.lua
@@ -137,7 +137,7 @@ function SpatialConvolution:__tostring__()
    if self.padding and self.padding ~= 0 then
      s = s .. ', ' .. self.padding .. ',' .. self.padding
    elseif (self.padW or self.padH) and (self.padW ~= 0 or self.padH ~= 0) then
-     s = s .. ', ' .. self.padW .. ',' .. self.padW
+     s = s .. ', ' .. self.padW .. ',' .. self.padH
    end
    return s .. ')'
 end
diff --git a/SpatialConvolutionMM.lua b/SpatialConvolutionMM.lua
@@ -100,7 +100,7 @@ function SpatialConvolutionMM:__tostring__()
    if self.padding and self.padding ~= 0 then
      s = s .. ', ' .. self.padding .. ',' .. self.padding
    elseif (self.padW or self.padH) and (self.padW ~= 0 or self.padH ~= 0) then
-     s = s .. ', ' .. self.padW .. ',' .. self.padW
+     s = s .. ', ' .. self.padW .. ',' .. self.padH
    end
    return s .. ')'
 end
diff --git a/test.lua b/test.lua
@@ -1520,7 +1520,7 @@ function nntest.SpatialConvolutionMM()
    mytester:asserteq(0, berr, torch.typename(module) .. ' - i/o backward err ')
 
    -- non-contiguous
-   local input = torch.randn(batch,from,inj,ini):transpose(3,4) -- non-contiguous
+   local input = torch.randn(batch,from,ini,inj):transpose(3,4) -- non-contiguous
    local inputc = input:contiguous() -- contiguous
    local output = module:forward(input)
    local outputc = module:forward(inputc)