modify format, and modify the layer grad test, op test

paddle/gserver/layers/ExpandConvLayer.cpp

@@ -39,21 +39,22 @@ bool ExpandConvLayer::init(const LayerMap &layerMap,
   filterShape_.resize(numInputs);
   outputShape_.resize(numInputs);
 
-  string convType;
-  string convGradInputType;
-  string convGradFilterType;
+  std::string convType;
+  std::string convGradInputType;
+  std::string convGradFilterType;
 
   for (int i = 0; i < config_.inputs_size(); i++) {
     std::vector<size_t> paddings = {(size_t)paddingY_[i], (size_t)padding_[i]};
     std::vector<size_t> strides = {(size_t)strideY_[i], (size_t)stride_[i]};
 
     if (useGpu_ && (size_t)groups_[i] == (size_t)channels_[i] && !isDeconv_) {
-      convType = "DepthwiseConv" convGradInputType =
-          "DepthwiseConvGradInput" convGradFilterType =
-              "DepthwiseConvGradFilter"
+      convType = "DepthwiseConv";
+      convGradInputType = "DepthwiseConvGradInput";
+      convGradFilterType = "DepthwiseConvGradFilter";
     } else {
-      convType = "GemmConv" convGradInputType =
-          "GemmConvGradInput" convGradFilterType = "GemmConvGradFilter"
+      convType = "GemmConv";
+      convGradInputType = "GemmConvGradInput";
+      convGradFilterType = "GemmConvGradFilter";
     }
 
     if (FLAGS_use_nnpack) {

paddle/gserver/tests/test_LayerGrad.cpp

@@ -349,13 +349,13 @@ TEST(Layer, CosSimVecMatLayer) {
 
 void testDepthwiseConvLayer(const string& type, bool useGpu) {
   TestConfig config;
-  config.biasSize = 16;
+  config.biasSize = 32;
   config.layerConfig.set_type(type);
-  config.layerConfig.set_num_filters(16);
+  config.layerConfig.set_num_filters(32);
   config.layerConfig.set_partial_sum(1);
   config.layerConfig.set_shared_biases(true);
 
-  config.inputDefs.push_back({INPUT_DATA, "layer_0", 2048, 192 / 2});
+  config.inputDefs.push_back({INPUT_DATA, "layer_0", 2048, 192});
   LayerInputConfig* input = config.layerConfig.add_inputs();
   ConvConfig* conv = input->mutable_conv_conf();
   conv->set_filter_size(2);
@@ -388,8 +388,11 @@ void testDepthwiseConvLayer(const string& type, bool useGpu) {
 }
 
 TEST(Layer, depthwiseConvLayer) {
+  //  'depthwise_conv' is a sepecial case of 'exconv' whose
+  //  groups size equals to the input channels size.
+  testDepthwiseConvLayer("exconv", /* useGpu= */ false);
 #ifndef PADDLE_ONLY_CPU
-  testDepthwiseConvLayer("depthwise_conv", /* useGpu= */ true);
+  testDepthwiseConvLayer("exconv", /* useGpu= */ true);
 #endif
 }