From 2ec1c44562667c33c48d3c90398972ab89cef8ac Mon Sep 17 00:00:00 2001 From: wanghaoshuang Date: Fri, 22 Nov 2019 14:27:21 +0800 Subject: [PATCH] Move sensitive from analysis package to prune package. --- paddleslim/analysis/__init__.py | 3 --- paddleslim/prune/__init__.py | 3 +++ paddleslim/{analysis => prune}/sensitive.py | 0 paddleslim/prune/sensitive_pruner.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename paddleslim/{analysis => prune}/sensitive.py (100%) diff --git a/paddleslim/analysis/__init__.py b/paddleslim/analysis/__init__.py index 76904c8d..9caa0d24 100644 --- a/paddleslim/analysis/__init__.py +++ b/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__ diff --git a/paddleslim/prune/__init__.py b/paddleslim/prune/__init__.py index f8f87862..b0122541 100644 --- a/paddleslim/prune/__init__.py +++ b/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__ diff --git a/paddleslim/analysis/sensitive.py b/paddleslim/prune/sensitive.py similarity index 100% rename from paddleslim/analysis/sensitive.py rename to paddleslim/prune/sensitive.py diff --git a/paddleslim/prune/sensitive_pruner.py b/paddleslim/prune/sensitive_pruner.py index 21f89003..6213382f 100644 --- a/paddleslim/prune/sensitive_pruner.py +++ b/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 -- GitLab