From aaf3a4ce61d9ea93a5730f2650547ade6ab057e1 Mon Sep 17 00:00:00 2001 From: wanghaoshuang Date: Mon, 11 Nov 2019 18:58:46 +0800 Subject: [PATCH] Remove unused unittest. --- paddleslim/tests/layers.py | 44 ----------- paddleslim/tests/test_nas_search_space.py | 43 ---------- paddleslim/tests/test_prune.py | 79 ------------------- ...earchspace.py => test_nas_search_space.py} | 15 ++-- tests/test_prune.py | 2 +- 5 files changed, 10 insertions(+), 173 deletions(-) delete mode 100644 paddleslim/tests/layers.py delete mode 100644 paddleslim/tests/test_nas_search_space.py delete mode 100644 paddleslim/tests/test_prune.py rename tests/{test_searchspace.py => test_nas_search_space.py} (83%) diff --git a/paddleslim/tests/layers.py b/paddleslim/tests/layers.py deleted file mode 100644 index 140ff591..00000000 --- a/paddleslim/tests/layers.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2019 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. -import paddle.fluid as fluid -from paddle.fluid.param_attr import ParamAttr - - -def conv_bn_layer(input, - num_filters, - filter_size, - name, - stride=1, - groups=1, - act=None): - conv = fluid.layers.conv2d( - input=input, - num_filters=num_filters, - filter_size=filter_size, - stride=stride, - padding=(filter_size - 1) // 2, - groups=groups, - act=None, - param_attr=ParamAttr(name=name + "_weights"), - bias_attr=False, - name=name + "_out") - bn_name = name + "_bn" - return fluid.layers.batch_norm( - input=conv, - act=act, - name=bn_name + '_output', - param_attr=ParamAttr(name=bn_name + '_scale'), - bias_attr=ParamAttr(bn_name + '_offset'), - moving_mean_name=bn_name + '_mean', - moving_variance_name=bn_name + '_variance', ) diff --git a/paddleslim/tests/test_nas_search_space.py b/paddleslim/tests/test_nas_search_space.py deleted file mode 100644 index c2f2af5b..00000000 --- a/paddleslim/tests/test_nas_search_space.py +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2019 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. - -import sys -sys.path.append('..') -import unittest -import paddle.fluid as fluid -from nas.search_space_factory import SearchSpaceFactory - -class TestSearchSpace(unittest.TestCase): - def test_searchspace(self): - # if output_size is 1, the model will add fc layer in the end. - config = {'input_size': 224, 'output_size': 7, 'block_num': 5} - space = SearchSpaceFactory() - - my_space = space.get_search_space('MobileNetV2Space', config) - model_arch = my_space.token2arch() - - train_prog = fluid.Program() - startup_prog = fluid.Program() - with fluid.program_guard(train_prog, startup_prog): - input_size= config['input_size'] - model_input = fluid.layers.data(name='model_in', shape=[1, 3, input_size, input_size], dtype='float32', append_batch_size=False) - predict = model_arch(model_input) - self.assertTrue(predict.shape[2] == config['output_size']) - - - #for op in train_prog.global_block().ops: - # print(op.type) - -if __name__ == '__main__': - unittest.main() diff --git a/paddleslim/tests/test_prune.py b/paddleslim/tests/test_prune.py deleted file mode 100644 index 93609367..00000000 --- a/paddleslim/tests/test_prune.py +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (c) 2019 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. -import sys -sys.path.append("../") -import unittest -import paddle.fluid as fluid -from prune import Pruner -from layers import conv_bn_layer - - -class TestPrune(unittest.TestCase): - def test_prune(self): - main_program = fluid.Program() - startup_program = fluid.Program() - # X X O X O - # conv1-->conv2-->sum1-->conv3-->conv4-->sum2-->conv5-->conv6 - # | ^ | ^ - # |____________| |____________________| - # - # X: prune output channels - # O: prune input channels - with fluid.program_guard(main_program, startup_program): - input = fluid.data(name="image", shape=[None, 3, 16, 16]) - conv1 = conv_bn_layer(input, 8, 3, "conv1") - conv2 = conv_bn_layer(conv1, 8, 3, "conv2") - sum1 = conv1 + conv2 - conv3 = conv_bn_layer(sum1, 8, 3, "conv3") - conv4 = conv_bn_layer(conv3, 8, 3, "conv4") - sum2 = conv4 + sum1 - conv5 = conv_bn_layer(sum2, 8, 3, "conv5") - conv6 = conv_bn_layer(conv5, 8, 3, "conv6") - - shapes = {} - for param in main_program.global_block().all_parameters(): - shapes[param.name] = param.shape - - place = fluid.CPUPlace() - exe = fluid.Executor(place) - scope = fluid.Scope() - exe.run(startup_program, scope=scope) - pruner = Pruner() - main_program = pruner.prune( - main_program, - scope, - params=["conv4_weights"], - ratios=[0.5], - place=place, - lazy=False, - only_graph=False, - param_backup=None, - param_shape_backup=None) - - shapes = { - "conv1_weights": (4L, 3L, 3L, 3L), - "conv2_weights": (4L, 4L, 3L, 3L), - "conv3_weights": (8L, 4L, 3L, 3L), - "conv4_weights": (4L, 8L, 3L, 3L), - "conv5_weights": (8L, 4L, 3L, 3L), - "conv6_weights": (8L, 8L, 3L, 3L) - } - - for param in main_program.global_block().all_parameters(): - if "weights" in param.name: - self.assertTrue(param.shape == shapes[param.name]) - - -if __name__ == '__main__': - unittest.main() diff --git a/tests/test_searchspace.py b/tests/test_nas_search_space.py similarity index 83% rename from tests/test_searchspace.py rename to tests/test_nas_search_space.py index 5e3557bb..00691fc7 100644 --- a/tests/test_searchspace.py +++ b/tests/test_nas_search_space.py @@ -11,15 +11,16 @@ # 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. + import sys -sys.path.append("../") +sys.path.append('..') import unittest import paddle.fluid as fluid -from paddleslim.nas import SearchSpaceFactory +from nas.search_space_factory import SearchSpaceFactory -class TestSearchSpaceFactory(unittest.TestCase): - def test_factory(self): +class TestSearchSpace(unittest.TestCase): + def test_searchspace(self): # if output_size is 1, the model will add fc layer in the end. config = {'input_size': 224, 'output_size': 7, 'block_num': 5} space = SearchSpaceFactory() @@ -36,10 +37,12 @@ class TestSearchSpaceFactory(unittest.TestCase): shape=[1, 3, input_size, input_size], dtype='float32', append_batch_size=False) - print('input shape', model_input.shape) predict = model_arch(model_input) - print('output shape', predict.shape) + self.assertTrue(predict.shape[2] == config['output_size']) + +#for op in train_prog.global_block().ops: +# print(op.type) if __name__ == '__main__': unittest.main() diff --git a/tests/test_prune.py b/tests/test_prune.py index 3fdaa867..93609367 100644 --- a/tests/test_prune.py +++ b/tests/test_prune.py @@ -15,7 +15,7 @@ import sys sys.path.append("../") import unittest import paddle.fluid as fluid -from paddleslim.prune import Pruner +from prune import Pruner from layers import conv_bn_layer -- GitLab