From 03f4b1d4d2073248acedef00eb0d313f03ebf789 Mon Sep 17 00:00:00 2001
From: wangyang59 <wangyang59@baidu.com>
Date: Mon, 7 Nov 2016 09:49:33 -0800
Subject: [PATCH] minor changes on deconv per luotao1 comments

---
 paddle/gserver/tests/test_LayerGrad.cpp        | 1 -
 python/paddle/trainer_config_helpers/layers.py | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/paddle/gserver/tests/test_LayerGrad.cpp b/paddle/gserver/tests/test_LayerGrad.cpp
index 9e2e5ebaac2..0fed97a73b0 100644
--- a/paddle/gserver/tests/test_LayerGrad.cpp
+++ b/paddle/gserver/tests/test_LayerGrad.cpp
@@ -353,7 +353,6 @@ TEST(Layer, convTransLayer) {
   testConvTransLayer("exconvt", /* trans= */ false, /* useGpu= */ false);
 #ifndef PADDLE_ONLY_CPU
   testConvTransLayer("exconvt", /* trans= */ false, /* useGpu= */ true);
-  // testConvLayer("cudnn_conv", /* trans= */ false, /* useGpu= */ true);
 #endif
 }
 
diff --git a/python/paddle/trainer_config_helpers/layers.py b/python/paddle/trainer_config_helpers/layers.py
index 1fdb1a849e8..ecc73c34a83 100644
--- a/python/paddle/trainer_config_helpers/layers.py
+++ b/python/paddle/trainer_config_helpers/layers.py
@@ -1619,10 +1619,7 @@ def img_conv_layer(input, filter_size, num_filters,
         param_attr.attr["initial_strategy"] = 0
         param_attr.attr["initial_smart"] = False
     
-    if trans:
-        lt = LayerType.CONVTRANS_LAYER
-    else:
-        lt = LayerType.CONV_LAYER
+    lt = LayerType.CONVTRANS_LAYER if trans else LayerType.CONV_LAYER
     
     Layer(
         name=name,
-- 
GitLab