Merge branch 'develop' into 'develop'

Move sensitive from analysis package to prune package.

See merge request !43

paddleslim/analysis/__init__.py

@@ -15,9 +15,6 @@ import flops as flops_module
 from flops import *
 import model_size as model_size_module
 from model_size import *
-import sensitive
-from sensitive import *
 __all__ = []
 __all__ += flops_module.__all__
 __all__ += model_size_module.__all__
-__all__ += sensitive.__all__

paddleslim/prune/__init__.py

@@ -21,6 +21,8 @@ import controller_client
 from controller_client import *
 import sensitive_pruner
 from sensitive_pruner import *
+import sensitive
+from sensitive import *
 
 __all__ = []
 __all__ += pruner.__all__
@@ -28,3 +30,4 @@ __all__ += auto_pruner.__all__
 __all__ += controller_server.__all__
 __all__ += controller_client.__all__
 __all__ += sensitive_pruner.__all__
+__all__ += sensitive.__all__

paddleslim/prune/sensitive_pruner.py

@@ -19,7 +19,7 @@ from scipy.optimize import leastsq
 import numpy as np
 import paddle.fluid as fluid
 from ..common import get_logger
-from ..analysis import sensitivity
+from .sensitive import sensitivity
 from ..analysis import flops
 from .pruner import Pruner