diff options
author | Francisco Massa <fvsmassa@gmail.com> | 2015-06-19 12:55:21 +0300 |
---|---|---|
committer | Francisco Massa <fvsmassa@gmail.com> | 2015-06-19 12:55:21 +0300 |
commit | cc372516ab48fb4316423d2a8546ce469ee459b8 (patch) | |
tree | c66eac99e05a3d7e7c0421138a196727b82cb25e | |
parent | a98f4b856cd9cab08cbaf5f975dea9c1a391563f (diff) |
Fix print in SpatialConvolution and correct non-contiguous test in SpatialConvolutionMM
-rw-r--r-- | SpatialConvolution.lua | 2 | ||||
-rw-r--r-- | SpatialConvolutionMM.lua | 2 | ||||
-rw-r--r-- | test.lua | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/SpatialConvolution.lua b/SpatialConvolution.lua index 84412b0..af25233 100644 --- 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 index b100094..510a553 100644 --- 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 @@ -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) |