max pool Layer with mask #4891

NHZlX · 2017-10-18T11:21:42Z

python usage:

tmp = paddle.layer.img_pool(
                         input=tmp,
                         pool_size=7,
                         stride=1,
                         pool_type=paddle.pooling.MaxWithMask())

… poolmaxpool_with_mask

hedaoyuan · 2017-10-20T09:44:06Z

paddle/cuda/src/hl_cuda_cnn.cu

-                                 const int tgtStride) {
+                                 const int tgtStride,
+                                 real* maskData,
+                                 bool withMask) {


Do not need withMask, we can check whether maskData a NULL pointer.

hedaoyuan · 2017-10-20T09:44:57Z

paddle/cuda/include/hl_cnn.h

+ * @param[out]  tgtData     output data.
+ * @param[in]   tgtStride   stride between output data samples.
+ * @param[out]  maskData    the location indices of select max data
+ * @param[in]   withMask    set true if output maskData


Remove line 77 and 78.

hedaoyuan · 2017-10-20T09:48:43Z

paddle/cuda/src/hl_cuda_cnn.cu

-        if (maxval < inputData[h * width + w])
+        if (maxval < inputData[h * width + w]) {
          maxval = inputData[h * width + w];
+          max_index = h * width + w;


maxval = inputData[max_index];

hedaoyuan · 2017-10-20T09:54:03Z

paddle/cuda/include/hl_cnn.h

+ * @param[out]  maskData    the location indices of select max data
+ * @param[in]   withMask    set true if output maskData
+ */
+extern void hl_maxpool_forward(const int frameCnt,


There is no need to add this interface. Only need to add a maskData parameter to the original interface.

hedaoyuan · 2017-10-20T09:58:08Z

paddle/gserver/layers/PoolLayer.h

  int confPaddingY_;

  std::string poolType_;
+  bool with_mask_;


Do not need with_mask_.

hedaoyuan · 2017-10-20T10:04:23Z

paddle/math/Matrix.cpp

+                 false);
+}
+
+void GpuMatrix::maxPoolForward(Matrix& inputMat,


Also, do not need to add a new interface.

hedaoyuan · 2017-10-20T10:10:52Z

paddle/gserver/layers/Projection.h

    forward();
  }

+  void forward(const Argument* in,


Do not change this file.
We can add a PoolMaxWithMaskLayer, and create this layer in the PoolLayer::create when pool == "max-pool-with-mask" .

hedaoyuan

Do not modify the implementation of the original Layer. The current Operator refactoring is based on the Layer, modify the original Layer implementation may be confused on the reconstruction. You can add a PoolMaxWithMaskLayer to avoid modifying the original layer.

… poolmaxpool_with_mask

hedaoyuan · 2017-11-13T11:42:56Z

paddle/math/Matrix.cpp

-            for (int w = wstart; w < wend; ++w) {
-              outData[ph * outputW + pw] = std::max(
-                  outData[ph * outputW + pw], inputData[h * imgSizeW + w]);
+          if (maskMatP == NULL) {


Is the if (maskMatP == NULL) can be inside the for loop? And use maskData == NULL instead of maskMatP == NULL.

hedaoyuan · 2017-11-13T11:43:10Z

paddle/math/Matrix.cpp

      inputData += inLength;
      outData += outLength;
+
+      if (maskMatP != NULL) maskData += outLength;


Use maskData != NULL instead of maskMatP != NULL.

hedaoyuan · 2017-11-13T11:47:26Z

python/paddle/trainer_config_helpers/layers.py

+    assert type(pool_type) in [AvgPooling, MaxPooling, MaxWithMaskPooling, CudnnAvgPooling,
                               CudnnMaxPooling], \
-        "only (Cudnn)AvgPooling, (Cudnn)MaxPooling are supported"
+        "only (Cudnn)AvgPooling, (Cudnn)MaxPooling MaxWithMaskPooling are supported"


add , before MaxWithMaskPooling

hedaoyuan · 2017-11-13T11:53:31Z

paddle/gserver/layers/MaxPoolWithMaskLayer.cpp

+                        sizeY_,
+                        confPaddingY_,
+                        strideY_,
+                        /* caffeMode */ false);


Is it can be modified into caffeMode = true? The other Layer (Pooling, Conv) default is true.

The caffeMode in poolProjection.cpp is false, i referred there. https://github.com/PaddlePaddle/Paddle/blob/develop/paddle/gserver/layers/PoolProjection.cpp#L51

hedaoyuan · 2017-11-13T11:57:31Z

paddle/gserver/tests/test_MaxPoolingWithMaskOutput.cpp

+  maskMat->setData(maskData);
+  doOneMaxPoolingWithMaskOutputTest(
+      inputMat, "max-pool-with-mask", useGpu, maskMat);
+  /*


Remove line 108-118

I forgot to delete the annotation symbol, it supports the gpu test

hedaoyuan · 2017-11-13T12:00:37Z

paddle/gserver/tests/test_MaxPoolingWithMaskOutput.cpp

+  pool->set_stride(sw);
+  pool->set_stride_y(sh);
+
+  int ow = outputSize(pool->img_size(), kw, pw, sw, /* caffeMode */ false);


If you change the value of caffeMode in the Layer, this also needs to be modified.

… poolmaxpool_with_mask

NHZlX added 5 commits October 18, 2017 17:39

add max-pool-with-mask python interface

720274d

add max-pool-with-mask c++ impl

9621213

add cuda and cpu pool_forward_with_mask impl

afa6902

add layerGrad test and maskoutput test

ff20a11

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

c876dfa

… poolmaxpool_with_mask

NHZlX requested a review from hedaoyuan October 18, 2017 11:22

hedaoyuan requested changes Oct 20, 2017

View reviewed changes

NHZlX added 12 commits November 10, 2017 15:47

add the max pool with mask layer

8106f41

delete mask pool interface from poolprojection

a54565e

pull develop and fix conflict

ba2e5de

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

2ef1867

… poolmaxpool_with_mask

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

921f723

… poolmaxpool_with_mask

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

3428a52

… poolmaxpool_with_mask

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

9e894f6

… poolmaxpool_with_mask

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

4ebb05c

… poolmaxpool_with_mask

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

b29cbd4

… poolmaxpool_with_mask

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

69147da

… poolmaxpool_with_mask

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

471573e

… poolmaxpool_with_mask

fix bug with default parameter

5aa3e76

hedaoyuan reviewed Nov 13, 2017

View reviewed changes

NHZlX added 2 commits November 14, 2017 11:56

fix comments

0b9c4cd

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

e19b931

… poolmaxpool_with_mask

hedaoyuan approved these changes Nov 14, 2017

View reviewed changes

NHZlX merged commit 3e6f768 into PaddlePaddle:develop Nov 14, 2017

max pool Layer with mask #4891

max pool Layer with mask #4891

Uh oh!

Conversation

NHZlX commented Oct 18, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hedaoyuan left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NHZlX Nov 14, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

NHZlX Nov 14, 2017 •

edited

Loading