refine the conf files, combine in one file

paddle/gserver/tests/mkldnn_branches_conv_conv_addto_32c.conf → paddle/gserver/tests/mkldnn_branches_conv.conf

@@ -15,31 +15,42 @@
 from paddle.trainer_config_helpers import *
 
 settings(batch_size=16)
+channels = get_config_arg("channels", int, 2)
 
-data = data_layer(name ="input", size=32*16*16)
+def two_conv(input, group_name):
+  out1 = img_conv_layer(input=input,
+            name=group_name+'_conv1',
+            filter_size=1,
+            num_filters=channels,
+            padding=0,
+            shared_biases=True,
+            act=ReluActivation())
 
-conv = img_conv_layer(input=data,
-            num_channels=32,
+  out2 = img_conv_layer(input=input,
+            name=group_name+'_conv2',
             filter_size=3,
-            num_filters=32,
+            num_filters=channels,
             padding=1,
             shared_biases=True,
             act=ReluActivation())
+  return out1, out2
 
-b1 = img_conv_layer(input=conv,
-            filter_size=1,
-            num_filters=32,
-            padding=0,
-            shared_biases=True,
-            act=ReluActivation())
+data = data_layer(name ="input", size=channels*16*16)
 
-b2 = img_conv_layer(input=conv,
+conv = img_conv_layer(input=data,
+            num_channels=channels,
             filter_size=3,
-            num_filters=32,
+            num_filters=channels,
             padding=1,
             shared_biases=True,
             act=ReluActivation())
 
-concat = addto_layer(input=[b1, b2])
+a1, a2 = two_conv(input=conv, group_name='a')
+
+concat = concat_layer(input=[a1, a2])
+
+b1, b2 = two_conv(input=conv, group_name='b')
+
+addto = addto_layer(input=[b1, b2])
 
-outputs(concat)
+outputs([concat, addto])

paddle/gserver/tests/mkldnn_branches_conv_conv_addto.conf

-# Copyright (c) 2017 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from paddle.trainer_config_helpers import *
-
-settings(batch_size=2)
-
-data = data_layer(name ="input", size=3*4*4)
-
-conv = img_conv_layer(input=data,
-            num_channels=1,
-            filter_size=3,
-            num_filters=2,
-            padding=1,
-            shared_biases=True,
-            act=ReluActivation())
-
-b1 = img_conv_layer(input=conv,
-            filter_size=1,
-            num_filters=2,
-            padding=0,
-            shared_biases=True,
-            act=ReluActivation())
-
-b2 = img_conv_layer(input=conv,
-            filter_size=3,
-            num_filters=2,
-            padding=1,
-            shared_biases=True,
-            act=ReluActivation())
-
-concat = addto_layer(input=[b1, b2])
-
-outputs(concat)

paddle/gserver/tests/mkldnn_branches_conv_conv_concat.conf

-# Copyright (c) 2017 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from paddle.trainer_config_helpers import *
-
-settings(batch_size=2)
-
-data = data_layer(name ="input", size=3*4*4)
-
-conv = img_conv_layer(input=data,
-            num_channels=1,
-            filter_size=3,
-            num_filters=2,
-            padding=1,
-            shared_biases=True,
-            act=ReluActivation())
-
-b1 = img_conv_layer(input=conv,
-            filter_size=1,
-            num_filters=2,
-            padding=0,
-            shared_biases=True,
-            act=ReluActivation())
-
-b2 = img_conv_layer(input=conv,
-            filter_size=3,
-            num_filters=2,
-            padding=1,
-            shared_biases=True,
-            act=ReluActivation())
-
-concat = concat_layer(input=[b1, b2])
-
-outputs(concat)

paddle/gserver/tests/mkldnn_branches_conv_conv_concat_32c.conf

-# Copyright (c) 2017 PaddlePaddle Authors. All Rights Reserved
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from paddle.trainer_config_helpers import *
-
-settings(batch_size=16)
-
-data = data_layer(name ="input", size=32*16*16)
-
-conv = img_conv_layer(input=data,
-            num_channels=32,
-            filter_size=3,
-            num_filters=32,
-            padding=1,
-            shared_biases=True,
-            act=ReluActivation())
-
-b1 = img_conv_layer(input=conv,
-            filter_size=1,
-            num_filters=32,
-            padding=0,
-            shared_biases=True,
-            act=ReluActivation())
-
-b2 = img_conv_layer(input=conv,
-            filter_size=3,
-            num_filters=32,
-            padding=1,
-            shared_biases=True,
-            act=ReluActivation())
-
-concat = concat_layer(input=[b1, b2])
-
-outputs(concat)

paddle/gserver/tests/test_MKLDNN.cpp

@@ -248,15 +248,18 @@ TEST(MKLDNNActivation, Activations) {
   }
 }
 
+DECLARE_string(config_args);
 TEST(MKLDNNLayer, branches) {
-  std::vector<std::string> cases = {"conv_conv_concat",
-                                    "conv_conv_concat_32c",
-                                    "conv_conv_addto",
-                                    "conv_conv_addto_32c"};
+  std::vector<std::string> cases = {"conv"};
   for (auto name : cases) {
     std::string config = "./gserver/tests/mkldnn_branches_" + name + ".conf";
+    for (auto channels : {2, 32}) {
+      std::ostringstream oss;
+      oss << "channels=" << channels;
+      FLAGS_config_args = oss.str();
       MKLDNNTester::runBranchesTest(config);
     }
+  }
 }
 
 int main(int argc, char** argv) {