From 60b84856e7402306b79a867aa321530f85c54856 Mon Sep 17 00:00:00 2001 From: tensor-tang Date: Tue, 17 Oct 2017 17:48:51 +0800 Subject: [PATCH] refine the conf files, combine in one file --- ...dto_32c.conf => mkldnn_branches_conv.conf} | 39 ++++++++++------ .../mkldnn_branches_conv_conv_addto.conf | 45 ------------------- .../mkldnn_branches_conv_conv_concat.conf | 45 ------------------- .../mkldnn_branches_conv_conv_concat_32c.conf | 45 ------------------- paddle/gserver/tests/test_MKLDNN.cpp | 13 +++--- 5 files changed, 33 insertions(+), 154 deletions(-) rename paddle/gserver/tests/{mkldnn_branches_conv_conv_addto_32c.conf => mkldnn_branches_conv.conf} (62%) delete mode 100644 paddle/gserver/tests/mkldnn_branches_conv_conv_addto.conf delete mode 100644 paddle/gserver/tests/mkldnn_branches_conv_conv_concat.conf delete mode 100644 paddle/gserver/tests/mkldnn_branches_conv_conv_concat_32c.conf diff --git a/paddle/gserver/tests/mkldnn_branches_conv_conv_addto_32c.conf b/paddle/gserver/tests/mkldnn_branches_conv.conf similarity index 62% rename from paddle/gserver/tests/mkldnn_branches_conv_conv_addto_32c.conf rename to paddle/gserver/tests/mkldnn_branches_conv.conf index f6d30f12e87..2628509db43 100644 --- a/paddle/gserver/tests/mkldnn_branches_conv_conv_addto_32c.conf +++ b/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]) diff --git a/paddle/gserver/tests/mkldnn_branches_conv_conv_addto.conf b/paddle/gserver/tests/mkldnn_branches_conv_conv_addto.conf deleted file mode 100644 index 59791ecc671..00000000000 --- a/paddle/gserver/tests/mkldnn_branches_conv_conv_addto.conf +++ /dev/null @@ -1,45 +0,0 @@ -# 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) diff --git a/paddle/gserver/tests/mkldnn_branches_conv_conv_concat.conf b/paddle/gserver/tests/mkldnn_branches_conv_conv_concat.conf deleted file mode 100644 index 1178c6f5b2f..00000000000 --- a/paddle/gserver/tests/mkldnn_branches_conv_conv_concat.conf +++ /dev/null @@ -1,45 +0,0 @@ -# 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) diff --git a/paddle/gserver/tests/mkldnn_branches_conv_conv_concat_32c.conf b/paddle/gserver/tests/mkldnn_branches_conv_conv_concat_32c.conf deleted file mode 100644 index 8a624ac8385..00000000000 --- a/paddle/gserver/tests/mkldnn_branches_conv_conv_concat_32c.conf +++ /dev/null @@ -1,45 +0,0 @@ -# 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) diff --git a/paddle/gserver/tests/test_MKLDNN.cpp b/paddle/gserver/tests/test_MKLDNN.cpp index d455b738c20..3571fbb9e33 100644 --- a/paddle/gserver/tests/test_MKLDNN.cpp +++ b/paddle/gserver/tests/test_MKLDNN.cpp @@ -248,14 +248,17 @@ TEST(MKLDNNActivation, Activations) { } } +DECLARE_string(config_args); TEST(MKLDNNLayer, branches) { - std::vector cases = {"conv_conv_concat", - "conv_conv_concat_32c", - "conv_conv_addto", - "conv_conv_addto_32c"}; + std::vector cases = {"conv"}; for (auto name : cases) { std::string config = "./gserver/tests/mkldnn_branches_" + name + ".conf"; - MKLDNNTester::runBranchesTest(config); + for (auto channels : {2, 32}) { + std::ostringstream oss; + oss << "channels=" << channels; + FLAGS_config_args = oss.str(); + MKLDNNTester::runBranchesTest(config); + } } } -- GitLab