From 0b9c4cd7e5fd194110defbf1649d54da2e068c8b Mon Sep 17 00:00:00 2001
From: xzl <zlx_hg@163.com>
Date: Tue, 14 Nov 2017 11:56:29 +0800
Subject: [PATCH] fix comments

---
 paddle/cuda/src/hl_cuda_cnn.cu                |  2 +-
 .../tests/test_MaxPoolingWithMaskOutput.cpp   | 20 +++++++++----------
 paddle/math/Matrix.cpp                        |  4 ++--
 .../paddle/trainer_config_helpers/layers.py   |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/paddle/cuda/src/hl_cuda_cnn.cu b/paddle/cuda/src/hl_cuda_cnn.cu
index a91ead240..3699b1e8a 100644
--- a/paddle/cuda/src/hl_cuda_cnn.cu
+++ b/paddle/cuda/src/hl_cuda_cnn.cu
@@ -51,8 +51,8 @@ __global__ void KeMaxPoolForward(const int nthreads,
     for (int h = hstart; h < hend; ++h) {
       for (int w = wstart; w < wend; ++w) {
         if (maxval < inputData[h * width + w]) {
-          maxval = inputData[h * width + w];
           max_index = h * width + w;
+          maxval = inputData[max_index];
         }
       }
     }
diff --git a/paddle/gserver/tests/test_MaxPoolingWithMaskOutput.cpp b/paddle/gserver/tests/test_MaxPoolingWithMaskOutput.cpp
index 44fc2b91e..16438886d 100644
--- a/paddle/gserver/tests/test_MaxPoolingWithMaskOutput.cpp
+++ b/paddle/gserver/tests/test_MaxPoolingWithMaskOutput.cpp
@@ -105,15 +105,13 @@ TEST(Layer, maxPoolingWithMaskOutputLayerFwd) {
   maskMat->setData(maskData);
   doOneMaxPoolingWithMaskOutputTest(
       inputMat, "max-pool-with-mask", useGpu, maskMat);
-  /*
-  #ifdef PADDLE_WITH_CUDA
-    useGpu = true;
-    inputMat = Matrix::create(1, 25, false, useGpu);
-    maskMat = Matrix::create(1, 4, false, useGpu);
-    inputMat->copyFrom(inputData, 25);
-    maskMat->copyFrom(maskData, 4);
-    doOneMaxPoolingWithMaskOutputTest(
-        inputMat, "max-pool-with-mask", useGpu, maskMat);
-  #endif
-  */
+#ifdef PADDLE_WITH_CUDA
+  useGpu = true;
+  inputMat = Matrix::create(1, 25, false, useGpu);
+  maskMat = Matrix::create(1, 4, false, useGpu);
+  inputMat->copyFrom(inputData, 25);
+  maskMat->copyFrom(maskData, 4);
+  doOneMaxPoolingWithMaskOutputTest(
+      inputMat, "max-pool-with-mask", useGpu, maskMat);
+#endif
 }
diff --git a/paddle/math/Matrix.cpp b/paddle/math/Matrix.cpp
index 743922cd9..41ee50896 100644
--- a/paddle/math/Matrix.cpp
+++ b/paddle/math/Matrix.cpp
@@ -2021,7 +2021,7 @@ void CpuMatrix::maxPoolForward(Matrix& inputMat,
           int wstart = pw * strideW - paddingW;
           int wend = std::min(wstart + sizeX, imgSizeW);
           wstart = std::max(wstart, 0);
-          if (maskMatP == NULL) {
+          if (maskData == NULL) {
             for (int h = hstart; h < hend; ++h) {
               for (int w = wstart; w < wend; ++w) {
                 outData[ph * outputW + pw] = std::max(
@@ -2044,7 +2044,7 @@ void CpuMatrix::maxPoolForward(Matrix& inputMat,
       inputData += inLength;
       outData += outLength;
 
-      if (maskMatP != NULL) maskData += outLength;
+      if (maskData != NULL) maskData += outLength;
     }
   }
 }
diff --git a/python/paddle/trainer_config_helpers/layers.py b/python/paddle/trainer_config_helpers/layers.py
index f7ab7a5ca..e21071f5b 100644
--- a/python/paddle/trainer_config_helpers/layers.py
+++ b/python/paddle/trainer_config_helpers/layers.py
@@ -2701,7 +2701,7 @@ def img_pool_layer(input,
 
     assert type(pool_type) in [AvgPooling, MaxPooling, MaxWithMaskPooling, CudnnAvgPooling,
                                CudnnMaxPooling], \
-        "only (Cudnn)AvgPooling, (Cudnn)MaxPooling MaxWithMaskPooling are supported"
+        "only (Cudnn)AvgPooling, (Cudnn)MaxPooling, MaxWithMaskPooling are supported"
 
     type_name = pool_type.name + '-projection' \
         if (
-- 
GitLab