maxpool and meanpool added (#121)

maxpool and meanpool added

Author: staticfloat

src/pooling.jl

@@ -114,7 +114,7 @@ for backend in (Symbol(), :_direct, :_im2col)
                 fill!(y, xT(0))
                 return $(Symbol("$(name)$(backend)!"))(y, x, pdims; kwargs...)
             end
-            
+
             # Backprops too
             function $(Symbol("∇$(name)$(backend)"))(
                             dy::AbstractArray{T,N}, y::AbstractArray{T,N},
@@ -136,3 +136,20 @@ if is_nnpack_available()
         return func(x, pdims; kwargs...)
     end
 end
+
+expand(N, i::Tuple) = i
+expand(N, i::Integer) = ntuple(_ -> i, N)
+
+function maxpool(x, k::NTuple{N, Integer}; pad = 0, stride = k) where N
+    pad = expand(Val(N), pad)
+    stride = expand(Val(N), stride)
+    pdims = PoolDims(x, k; padding = pad, stride = stride)
+    return maxpool(x, pdims)
+end
+
+function meanpool(x, k::NTuple{N, Integer}; pad = 0, stride = k) where N
+    pad = expand(Val(N), pad)
+    stride = expand(Val(N), stride)
+    pdims = PoolDims(x, k; padding = pad, stride = stride)
+    return meanpool(x, pdims)
+end

test/pooling.jl

@@ -26,7 +26,7 @@ maxpool_answer_dict = Dict(
             3  13 18;
             5  15 20.
         ],
-        
+
         "dx" => [
             0 0 0  0;
             0 7 0 17;
@@ -58,7 +58,7 @@ maxpool_answer_dict = Dict(
             27, 28, 29, 30,
             32, 33, 34, 35,
             37, 38, 39, 40,
-            
+
             47, 48, 49, 50,
             52, 53, 54, 55,
             57, 58, 59, 60.
@@ -67,18 +67,18 @@ maxpool_answer_dict = Dict(
              1,  3, 5,
             11, 13, 15,
             16, 18, 20,
-            
+
             41, 43, 45,
             51, 53, 55,
             56, 58, 60.
         ], (3, 3, 2)),
-        
+
         "dx" => reshape([
             0, 0, 0, 0, 0,
             0, 0, 0, 0, 0,
             0, 0, 0, 0, 0,
             0, 0, 0, 0, 0,
-            
+
             0,  0, 0,  0, 0,
             0, 27, 0, 29, 0,
             0,  0, 0,  0, 0,
@@ -94,12 +94,12 @@ maxpool_answer_dict = Dict(
             0, 0, 0, 0, 0,
             0, 0, 0, 0, 0,
             0, 0, 0, 0, 0,
-            
+
             0,  0,  0,  0,  0,
             0, 27, 28, 29, 30,
             0, 32, 33, 34, 35,
             0, 37, 38, 39, 40,
-            
+
             0,  0,  0,  0,  0,
             0, 47, 48, 49, 50,
             0, 52, 53, 54, 55,
@@ -110,12 +110,12 @@ maxpool_answer_dict = Dict(
              0, 0,  0, 0,  0,
             11, 0, 13, 0, 15,
             16, 0, 18, 0, 20,
-            
+
             0, 0, 0, 0, 0,
             0, 0, 0, 0, 0,
             0, 0, 0, 0, 0,
             0, 0, 0, 0, 0,
-            
+
             41, 0, 43, 0, 45,
              0, 0,  0, 0,  0,
             51, 0, 53, 0, 55,
@@ -150,7 +150,7 @@ meanpool_answer_dict = Dict(
             1.25 10.0  8.75
             2.25 12.0  9.75
         ],
-        
+
         "dx" => [
             1.0 1.0 3.5 3.5;
             1.0 1.0 3.5 3.5;
@@ -182,7 +182,7 @@ meanpool_answer_dict = Dict(
             14.0, 15.0, 16.0, 17.0,
             19.0, 20.0, 21.0, 22.0,
             24.0, 25.0, 26.0, 27.0,
-            
+
             34.0, 35.0, 36.0, 37.0,
             39.0, 40.0, 41.0, 42.0,
             44.0, 45.0, 46.0, 47.0
@@ -191,31 +191,31 @@ meanpool_answer_dict = Dict(
             0.125, 0.625, 1.125,
             2.125, 5.0,   6.0,
             2.0,   4.375, 4.875,
-            
+
              7.75, 16.25, 17.25,
             19.25, 40.0,  42.0,
             11.5,  23.75, 24.75,
         ], (3, 3, 2)),
-        
+
         "dx" => reshape([
             1.75, 1.75, 2.0, 2.0, 0.0,
             1.75, 1.75, 2.0, 2.0, 0.0,
             3.0, 3.0, 3.25, 3.25, 0.0,
             3.0, 3.0, 3.25, 3.25, 0.0,
-            
+
             1.75, 1.75, 2.0, 2.0, 0.0,
             1.75, 1.75, 2.0, 2.0, 0.0,
             3.0, 3.0, 3.25, 3.25, 0.0,
             3.0, 3.0, 3.25, 3.25, 0.0,
-            
+
             0.0, 0.0, 0.0, 0.0, 0.0,
             0.0, 0.0, 0.0, 0.0, 0.0,
             0.0, 0.0, 0.0, 0.0, 0.0,
             0.0, 0.0, 0.0, 0.0, 0.0,
         ], (5, 4, 3)),
         "dx_nostride" => reshape([
             1.75,   3.625,  3.875,  4.125, 2.125,
-            4.125,  8.5,    9.0,    9.5,   4.875, 
+            4.125,  8.5,    9.0,    9.5,   4.875,
             5.375, 11.0,   11.5,   12.0,   6.125,
             3.0,    6.125,  6.375,  6.625, 3.375,
 
@@ -234,12 +234,12 @@ meanpool_answer_dict = Dict(
             0.265625, 0.625,    0.625,    0.75,     0.75,
             0.265625, 0.625,    0.625,    0.75,     0.75,
             0.25,     0.546875, 0.546875, 0.609375, 0.609375,
-            
+
             0.96875, 2.03125, 2.03125, 2.15625, 2.15625,
             2.40625, 5.0,     5.0,     5.25,    5.25,
             2.40625, 5.0,     5.0,     5.25,    5.25,
             1.4375,  2.96875, 2.96875, 3.09375, 3.09375,
-            
+
             0.96875, 2.03125, 2.03125, 2.15625, 2.15625,
             2.40625, 5.0,     5.0,     5.25,    5.25,
             2.40625, 5.0,     5.0,     5.25,    5.25,
@@ -296,4 +296,10 @@ for rank in (1, 2, 3)
             end
         end
     end
-end
+end
+
+x = rand(10, 10, 3, 10)
+@test size(maxpool(x, (2, 2))) == (5, 5, 3, 10)
+@test size(maxpool(x, (2, 2); pad = (2, 2), stride = (2, 2))) == (7, 7, 3, 10)
+@test size(meanpool(x, (2, 2))) == (5, 5, 3, 10)
+@test size(meanpool(x, (2, 2); pad = (2, 2), stride = (2, 2))) == (7, 7, 3, 10)