Skip to content

Commit

Permalink
Remove unnecessary function override in unpooling modules (#749)
Browse files Browse the repository at this point in the history
Doing so breaks deserialization on systems with different
architectures. These operations are cheap, so it's not a
problem to perform them even when there's no unpooling
associated.
  • Loading branch information
apaszke authored and soumith committed Apr 13, 2016
1 parent 130955e commit 9cffea5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 16 deletions.
5 changes: 5 additions & 0 deletions SpatialMaxPooling.lua
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ end

function SpatialMaxPooling:updateOutput(input)
self.indices = self.indices or input.new()

local dims = input:dim()
self.iheight = input:size(dims-1)
self.iwidth = input:size(dims)

-- backward compatibility
self.ceil_mode = self.ceil_mode or false
self.padW = self.padW or 0
Expand Down
9 changes: 1 addition & 8 deletions SpatialMaxUnpooling.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@ local SpatialMaxUnpooling, parent = torch.class('nn.SpatialMaxUnpooling', 'nn.Mo

function SpatialMaxUnpooling:__init(poolingModule)
parent.__init(self)
assert(torch.type(poolingModule)=='nn.SpatialMaxPooling', 'Argument must be a nn.SPatialMaxPooling module')
assert(torch.type(poolingModule)=='nn.SpatialMaxPooling', 'Argument must be a nn.SpatialMaxPooling module')
assert(poolingModule.kH==poolingModule.dH and poolingModule.kW==poolingModule.dW, "The size of pooling module's kernel must be equal to its stride")
self.pooling = poolingModule

poolingModule.updateOutput = function(pool, input)
local dims = input:dim()
pool.iheight = input:size(dims-1)
pool.iwidth = input:size(dims)
return nn.SpatialMaxPooling.updateOutput(pool, input)
end
end

function SpatialMaxUnpooling:setParams()
Expand Down
5 changes: 5 additions & 0 deletions VolumetricMaxPooling.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ function VolumetricMaxPooling:floor()
end

function VolumetricMaxPooling:updateOutput(input)
local dims = input:dim()
self.itime = input:size(dims-2)
self.iheight = input:size(dims-1)
self.iwidth = input:size(dims)

self.indices = self.indices or input.new()
input.THNN.VolumetricMaxPooling_updateOutput(
input:cdata(),
Expand Down
8 changes: 0 additions & 8 deletions VolumetricMaxUnpooling.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ function VolumetricMaxUnpooling:__init(poolingModule)
assert(torch.type(poolingModule)=='nn.VolumetricMaxPooling', 'Argument must be a nn.VolumetricMaxPooling module')
assert(poolingModule.kT==poolingModule.dT and poolingModule.kH==poolingModule.dH and poolingModule.kW==poolingModule.dW, "The size of pooling module's kernel must be equal to its stride")
self.pooling = poolingModule

poolingModule.updateOutput = function(pool, input)
local dims = input:dim()
pool.itime = input:size(dims-2)
pool.iheight = input:size(dims-1)
pool.iwidth = input:size(dims)
return nn.VolumetricMaxPooling.updateOutput(pool, input)
end
end

function VolumetricMaxUnpooling:setParams()
Expand Down

0 comments on commit 9cffea5

Please sign in to comment.