diff options
author | Clement Farabet <clement.farabet@gmail.com> | 2011-08-23 04:28:11 +0400 |
---|---|---|
committer | Clement Farabet <clement.farabet@gmail.com> | 2011-08-23 04:28:11 +0400 |
commit | 1c755f2b151e3800b3b7b97233962168ab83eab5 (patch) | |
tree | d0daf79b52fc1ca79f812be32bf5bb3b6ed89bd2 /SpatialNormalization.lua | |
parent | a7f7ad25a56fbb2787a9218748750bfcabe88e45 (diff) |
Replaced sparse->map.
Diffstat (limited to 'SpatialNormalization.lua')
-rw-r--r-- | SpatialNormalization.lua | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/SpatialNormalization.lua b/SpatialNormalization.lua index 48f1496..349098b 100644 --- a/SpatialNormalization.lua +++ b/SpatialNormalization.lua @@ -95,7 +95,7 @@ function SpatialNormalization:__init(...) -- kernel for weighted mean | nb of fe convo1:add(nn.SpatialPadding(self.padW,self.padW-self.kerWisPair, self.padH,self.padH-self.kerHisPair)) local ctable = nn.tables.oneToOne(nf) - convo1:add(nn.SpatialConvolutionSparse(ctable,ker:size(2),ker:size(1))) + convo1:add(nn.SpatialConvolutionMap(ctable,ker:size(2),ker:size(1))) convo1:add(nn.Sum(1)) convo1:add(nn.Replicate(nf)) -- set kernel @@ -110,7 +110,7 @@ function SpatialNormalization:__init(...) -- kernel for weighted mean | nb of fe convo2:add(nn.SpatialPadding(self.pad2W,self.pad2W-self.ker2WisPair, self.pad2H,self.pad2H-self.ker2HisPair)) local ctable = nn.tables.oneToOne(nf) - convo2:add(nn.SpatialConvolutionSparse(ctable,ker2:size(2),ker2:size(1))) + convo2:add(nn.SpatialConvolutionMap(ctable,ker2:size(2),ker2:size(1))) convo2:add(nn.Sum(1)) convo2:add(nn.Replicate(nf)) -- set kernel @@ -131,7 +131,7 @@ function SpatialNormalization:__init(...) -- kernel for weighted mean | nb of fe local convostd1 = nn.Sequential() convostd1:add(nn.SpatialPadding(self.padW,self.padW-self.kerWisPair, self.padH,self.padH-self.kerHisPair)) - convostd1:add(nn.SpatialConvolutionSparse(ctable,ker:size(2),ker:size(1))) + convostd1:add(nn.SpatialConvolutionMap(ctable,ker:size(2),ker:size(1))) convostd1:add(nn.Sum(1)) convostd1:add(nn.Replicate(nf)) -- set kernel @@ -145,7 +145,7 @@ function SpatialNormalization:__init(...) -- kernel for weighted mean | nb of fe local convostd2 = nn.Sequential() convostd2:add(nn.SpatialPadding(self.pad2W,self.pad2W-self.ker2WisPair, self.pad2H,self.pad2H-self.ker2HisPair)) - convostd2:add(nn.SpatialConvolutionSparse(ctable,ker2:size(2),ker2:size(1))) + convostd2:add(nn.SpatialConvolutionMap(ctable,ker2:size(2),ker2:size(1))) convostd2:add(nn.Sum(1)) convostd2:add(nn.Replicate(nf)) -- set kernel |