diff --git a/paddle/gserver/tests/test_LayerGrad.cpp b/paddle/gserver/tests/test_LayerGrad.cpp index 9e2e5ebaac24ee09b6121bc5a47298fa4cfd0197..0fed97a73b0a4dcba973fdbad4eb9e6bb99d9e05 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 1fdb1a849e86bea21cbbdb524c076e527ed8a258..ecc73c34a833cc4065adf846f7585f40e0df9704 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,