minor changes on deconv per luotao1 comments

03f4b1d4 · wangyang59 · 7a322df0 · 03f4b1d4 · 03f4b1d4
隐藏空白更改
内联并排

Showing with 1 addition and 5 deletion

paddle/gserver/tests/test_LayerGrad.cpp paddle/gserver/tests/test_LayerGrad.cpp +0 -1

python/paddle/trainer_config_helpers/layers.py python/paddle/trainer_config_helpers/layers.py +1 -4

未找到文件。
--- 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
 }


--- 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,