WIP for N-d pooling (based on

BVLC/caffe#2049 (comment))

Author: Chuck Cho

include/caffe/layers/pooling_layer.hpp

@@ -53,6 +53,18 @@ class PoolingLayer : public Layer<Dtype> {
   bool global_pooling_;
   Blob<Dtype> rand_idx_;
   Blob<int> max_idx_;
+
+  // Support ND pooling
+  Blob<int> kernel_shape_;
+  Blob<int> ext_kernel_shape_;
+  Blob<int> stride_;
+  Blob<int> pad_;
+  Blob<int> dilation_;
+  Blob<int> size_;
+  Blob<int> pooled_size_;
+
+  int channel_axis_;
+  int num_spatial_axes_;
 };
 
 }  // namespace caffe

src/caffe/layers/lrn_layer.cpp

@@ -38,8 +38,8 @@ void LRNLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom,
     LayerParameter pool_param;
     pool_param.mutable_pooling_param()->set_pool(
         PoolingParameter_PoolMethod_AVE);
-    pool_param.mutable_pooling_param()->set_pad(pre_pad_);
-    pool_param.mutable_pooling_param()->set_kernel_size(size_);
+    pool_param.mutable_pooling_param()->add_pad(pre_pad_);
+    pool_param.mutable_pooling_param()->add_kernel_size(size_);
     pool_layer_.reset(new PoolingLayer<Dtype>(pool_param));
     pool_layer_->SetUp(square_top_vec_, pool_top_vec_);
     // Set up power_layer_ to compute (1 + alpha_/N^2 s)^-beta_, where s is