From 7a322df0a8e9bf06be32eb2433445d2bc4f22997 Mon Sep 17 00:00:00 2001
From: wangyang59 <wangyang59@baidu.com>
Date: Fri, 4 Nov 2016 10:15:57 -0700
Subject: [PATCH] deconv implementation mionr changes in ConvBaseLayer.cpp and
 config_parser.py

---
 paddle/gserver/layers/ConvBaseLayer.cpp | 12 ++++--------
 python/paddle/trainer/config_parser.py  |  5 -----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/paddle/gserver/layers/ConvBaseLayer.cpp b/paddle/gserver/layers/ConvBaseLayer.cpp
index 733065a753..b9359867b9 100644
--- a/paddle/gserver/layers/ConvBaseLayer.cpp
+++ b/paddle/gserver/layers/ConvBaseLayer.cpp
@@ -20,12 +20,8 @@ bool ConvBaseLayer::init(const LayerMap& layerMap,
                          const ParameterMap& parameterMap) {
   /* Initialize the basic parent class */
   Layer::init(layerMap, parameterMap);
-
-  if (config_.type() == "exconv" || config_.type() == "cudnn_conv") {
-    isDeconv_ = false;
-  } else {
-    isDeconv_ = true;
-  }
+  isDeconv_ = (config_.type() == "exconv" || config_.type() == "cudnn_conv")
+              ? false : true;
 
   /* Initialize the convolutional layer parameter */
   numFilters_ = config_.num_filters();
@@ -111,9 +107,9 @@ size_t ConvBaseLayer::calOutputSize() {
              outputSize(inH[i], filterSizeY_[i], paddingY_[i], strideY_[i]));
          outW.push_back(
              outputSize(inW[i], filterSize_[i], padding_[i], stride_[i]));
-         CHECK_EQ(outH[i], outH[0]);
-         CHECK_EQ(outW[i], outW[0]);
        }
+       CHECK_EQ(outH[i], outH[0]);
+       CHECK_EQ(outW[i], outW[0]);
     }
     getOutput().setFrameHeight(outH[0]);
     getOutput().setFrameWidth(outW[0]);
diff --git a/python/paddle/trainer/config_parser.py b/python/paddle/trainer/config_parser.py
index 5ee46cd5f7..b75c261841 100644
--- a/python/paddle/trainer/config_parser.py
+++ b/python/paddle/trainer/config_parser.py
@@ -1666,11 +1666,6 @@ class ConvTransLayerBase(LayerBase):
         if self.layer_type == "cudnn_convt":
             config_assert(use_gpu, "cudnn_convt only support GPU")
 
-#         if (use_gpu == 1 and self.layer_type != "exconvt" and
-#            (parallel_nn == 0 or self.config.device > -1)):
-#             self.layer_type = "cudnn_convt"
-#         else:
-#             self.layer_type = "exconvt"
         # cudnn_convt has not been implemented so use exconvt only
         self.layer_type = "exconvt"
         # need to specify layer in config
-- 
GitLab