Merge branch 'rename_nas' into 'develop'

rename nas and move unittest

See merge request !12

paddleslim/nas/searchspace/mobilenetv2_space.py

@@ -16,13 +16,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import sys
-sys.path.append('..')
 import numpy as np
 import paddle.fluid as fluid
 from paddle.fluid.param_attr import ParamAttr
-from searchspacebase import SearchSpaceBase
-from .base_layer import conv_bn_layer
+from ..search_space_base import SearchSpaceBase
+from .layer import conv_bn_layer
 from .registry import SEARCHSPACE
 
 @SEARCHSPACE.register_module

paddleslim/nas/searchspace/registry.py

-import sys
-sys.path.append('..')
-from utils.registry import Registry
+from ..utils.registry import Registry
 
 SEARCHSPACE = Registry('searchspace')

paddleslim/prune/pruner.py

@@ -14,7 +14,7 @@
 
 import numpy as np
 import paddle.fluid as fluid
-from ..core import VarWrapper, OpWrapper, GraphWrapper
+from core import VarWrapper, OpWrapper, GraphWrapper
 
 __all__ = ["prune"]
 

paddleslim/nas/test_searchspace.py → paddleslim/tests/test_nas_search_space.py

@@ -12,25 +12,32 @@
 # 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 searchspacefactory import SearchSpaceFactory
-if __name__ == '__main__':
-    # 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)
-        print('input shape', model_input.shape)
-        predict = model_arch(model_input)
-        print('output shape', predict.shape)
+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)
+        #for op in train_prog.global_block().ops:
+        #    print(op.type)
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_prune.py → paddleslim/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