From 38cc5dadcc5c76c4aa50f5e92b560f4ccaba9227 Mon Sep 17 00:00:00 2001
From: chengduoZH <zhaochengduo@163.com>
Date: Fri, 18 Aug 2017 16:43:59 +0800
Subject: [PATCH] modified bias shape of ConvLayer

---
 paddle/gserver/layers/Conv3DLayer.cpp   |  5 -----
 paddle/gserver/layers/ConvBaseLayer.cpp | 17 ++++++++---------
 paddle/gserver/layers/DeConv3DLayer.cpp |  5 -----
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/paddle/gserver/layers/Conv3DLayer.cpp b/paddle/gserver/layers/Conv3DLayer.cpp
index 5609a4cc73..106909824d 100644
--- a/paddle/gserver/layers/Conv3DLayer.cpp
+++ b/paddle/gserver/layers/Conv3DLayer.cpp
@@ -37,11 +37,6 @@ bool Conv3DLayer::init(const LayerMap &layerMap,
           weights_[index]->getWGrad()->getHeight());
     ++index;
   }
-  if (nullptr != biases_->getWGrad())
-    biases_->getWGrad()->reshape(biases_->getWGrad()->width_,
-                                 biases_->getWGrad()->height_);
-  if (nullptr != biases_->getW())
-    biases_->getW()->reshape(biases_->getW()->width_, biases_->getW()->height_);
   CHECK(inputLayers_.size() == parameters_.size());
   return true;
 }
diff --git a/paddle/gserver/layers/ConvBaseLayer.cpp b/paddle/gserver/layers/ConvBaseLayer.cpp
index e437b0b86e..6bcbe0ddb2 100644
--- a/paddle/gserver/layers/ConvBaseLayer.cpp
+++ b/paddle/gserver/layers/ConvBaseLayer.cpp
@@ -21,11 +21,10 @@ bool ConvBaseLayer::init(const LayerMap& layerMap,
                          const ParameterMap& parameterMap) {
   /* Initialize the basic parent class */
   Layer::init(layerMap, parameterMap);
-  isDeconv_ = (config_.type() == "exconv" ||
-          config_.type() == "cudnn_conv" ||
-          config_.type() == "conv3d" ||
-          config_.type() == "deconv3d"   )
-                  ? false : true;
+  isDeconv_ = (config_.type() == "exconv" || config_.type() == "cudnn_conv" ||
+               config_.type() == "conv3d" || config_.type() == "deconv3d")
+                  ? false
+                  : true;
 
   /* Initialize the convolutional layer parameter */
   numFilters_ = config_.num_filters();
@@ -52,8 +51,8 @@ bool ConvBaseLayer::init(const LayerMap& layerMap,
     filterSizeZ_.push_back(conf.filter_size_z());
     imgSizeD_.push_back(conf.img_size_z());
     outputD_.push_back(conf.output_z());
-    filterPixels_.push_back(
-            filterSize_.back() * filterSizeY_.back() * filterSizeZ_.back());
+    filterPixels_.push_back(filterSize_.back() * filterSizeY_.back() *
+                            filterSizeZ_.back());
   }
 
   CHECK(inputLayers_.size() == parameters_.size());
@@ -73,10 +72,10 @@ bool ConvBaseLayer::init(const LayerMap& layerMap,
     if (sharedBiases_) {
       CHECK_EQ((size_t)numFilters_, biasParameter_->getSize());
       biases_ =
-          std::unique_ptr<Weight>(new Weight(numFilters_, 1, biasParameter_));
+          std::unique_ptr<Weight>(new Weight(1, numFilters_, biasParameter_));
     } else {
       biases_ =
-          std::unique_ptr<Weight>(new Weight(getSize(), 1, biasParameter_));
+          std::unique_ptr<Weight>(new Weight(1, getSize(), biasParameter_));
     }
   }
 
diff --git a/paddle/gserver/layers/DeConv3DLayer.cpp b/paddle/gserver/layers/DeConv3DLayer.cpp
index 286f5b985c..5a54a68447 100644
--- a/paddle/gserver/layers/DeConv3DLayer.cpp
+++ b/paddle/gserver/layers/DeConv3DLayer.cpp
@@ -39,11 +39,6 @@ bool DeConv3DLayer::init(const LayerMap &layerMap,
       weights_[index]->getWGrad()->reshape(filterPixels_[index] * numFilters_,
                                            filterChannels_[index]);
   }
-  if (biases_->getWGrad())
-    biases_->getWGrad()->reshape(biases_->getWGrad()->width_,
-                                 biases_->getWGrad()->height_);
-  if (biases_->getW())
-    biases_->getW()->reshape(biases_->getW()->width_, biases_->getW()->height_);
   CHECK(inputLayers_.size() == parameters_.size());
   return true;
 }
-- 
GitLab