fix bug with default parameter

QingshuChen · Nov 13, 2017 · 5aa3e76 · 5aa3e76
1 parent 471573e
commit 5aa3e76
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/paddle/cuda/include/stub/hl_cnn_stub.h b/paddle/cuda/include/stub/hl_cnn_stub.h
@@ -32,7 +32,7 @@ inline void hl_maxpool_forward(const int frameCnt,
                                const int paddingW,
                                real* tgtData,
                                const int tgtStride,
-                               real* MaskData = NULL) {}
+                               real* MaskData) {}
 
 inline void hl_maxpool_backward(const int frameCnt,
                                 const real* inputData,

diff --git a/paddle/gserver/layers/PoolProjection.cpp b/paddle/gserver/layers/PoolProjection.cpp
@@ -84,7 +84,6 @@ void MaxPoolProjection::forward() {
   CHECK_EQ(width, out_->value->getWidth());
   MatrixPtr inputV = in_->value;
   MatrixPtr outV = out_->value;
-
   outV->maxPoolForward(*inputV,
                        imgSizeY_,
                        imgSize_,

diff --git a/paddle/gserver/layers/PoolProjection.h b/paddle/gserver/layers/PoolProjection.h
@@ -37,6 +37,7 @@ class PoolProjection : public Projection {
   static PoolProjection* create(const ProjectionConfig& config,
                                 ParameterPtr parameter,
                                 bool useGpu);
+
   const std::string& getPoolType() const { return poolType_; }
 
   size_t getSize();
@@ -63,5 +64,4 @@ class AvgPoolProjection : public PoolProjection {
   virtual void forward();
   virtual void backward(const UpdateCallback& callback = nullptr);
 };
-
 }  // namespace paddle
diff --git a/paddle/gserver/layers/PoolProjectionLayer.cpp b/paddle/gserver/layers/PoolProjectionLayer.cpp
@@ -51,7 +51,6 @@ void PoolProjectionLayer::forward(PassType passType) {
   const Argument& in = getInput(0);
   int batchSize = in.value->getHeight();
   int size = getSize();
-
   resetOutput(batchSize, size);
   poolProjection_->forward(&in, &output_, passType);
 }