From e9ddff0047283beeeebf15ec9c64c6e0bc35cf95 Mon Sep 17 00:00:00 2001 From: liaogang Date: Mon, 8 May 2017 19:17:27 +0800 Subject: [PATCH] modify img_conv2 unit test --- paddle/gserver/tests/config_file_a.conf | 28 ++++++++++++++++++++ paddle/gserver/tests/config_file_b.conf | 28 ++++++++++++++++++++ paddle/gserver/tests/test_NetworkCompare.cpp | 7 ++--- 3 files changed, 58 insertions(+), 5 deletions(-) create mode 100644 paddle/gserver/tests/config_file_a.conf create mode 100644 paddle/gserver/tests/config_file_b.conf diff --git a/paddle/gserver/tests/config_file_a.conf b/paddle/gserver/tests/config_file_a.conf new file mode 100644 index 00000000000..5e4668f4fff --- /dev/null +++ b/paddle/gserver/tests/config_file_a.conf @@ -0,0 +1,28 @@ +#edit-mode: -*- python -*- +# Copyright (c) 2016 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=10) +data = data_layer(name ="input", size=8*16*16) +conv = img_conv_layer(input=data, filter_size=1, filter_size_y=1, + num_channels=8, + num_filters=16, stride=1, + bias_attr=True, + act=LinearActivation(), + groups=2, + layer_type="cudnn_conv") + +outputs(conv) diff --git a/paddle/gserver/tests/config_file_b.conf b/paddle/gserver/tests/config_file_b.conf new file mode 100644 index 00000000000..2de45466ced --- /dev/null +++ b/paddle/gserver/tests/config_file_b.conf @@ -0,0 +1,28 @@ +#edit-mode: -*- python -*- +# Copyright (c) 2016 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=10) +data = data_layer(name ="input", size=8*16*16) +conv = img_conv_layer(input=data, filter_size=1, filter_size_y=1, + num_channels=8, + num_filters=16, stride=1, + bias_attr=True, + act=LinearActivation(), + groups=2, + layer_type="exconv") + +outputs(conv) diff --git a/paddle/gserver/tests/test_NetworkCompare.cpp b/paddle/gserver/tests/test_NetworkCompare.cpp index ff1c195cee6..51b0e48bcc4 100644 --- a/paddle/gserver/tests/test_NetworkCompare.cpp +++ b/paddle/gserver/tests/test_NetworkCompare.cpp @@ -258,15 +258,12 @@ TEST(Compare, img_conv) { // Test cudnn_conv and exconv give the same result TEST(Compare, img_conv2) { - std::string config_file_a = "./gserver/tests/img_conv_a.conf"; - std::string config_file_b = "./gserver/tests/img_conv_c.conf"; + std::string config_file_a = "./gserver/tests/config_file_a.conf"; + std::string config_file_b = "./gserver/tests/config_file_b.conf"; bool useGpu = FLAGS_use_gpu; - double eps = FLAGS_checkgrad_eps; FLAGS_use_gpu = true; - FLAGS_checkgrad_eps = 1e-3; compareNetwork(config_file_a, config_file_b); FLAGS_use_gpu = useGpu; - FLAGS_checkgrad_eps = eps; } #endif -- GitLab