Remove redundant code in paddleslim/prune (PaddlePaddle#44)

lizexu123 · Jan 17, 2020 · d95da67 · d95da67
1 parent 405a468
commit d95da67
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 243 deletions.
diff --git a/paddleslim/common/__init__.py b/paddleslim/common/__init__.py
@@ -16,7 +16,7 @@
 from .log_helper import get_logger
 from .controller_server import ControllerServer
 from .controller_client import ControllerClient
-from .lock_utils import lock, unlock
+from .lock import lock, unlock
 from .cached_reader import cached_reader
 
 __all__ = [

diff --git a/paddleslim/common/controller_server.py b/paddleslim/common/controller_server.py
@@ -18,7 +18,7 @@
 import time
 from .log_helper import get_logger
 from threading import Thread
-from .lock_utils import lock, unlock
+from .lock import lock, unlock
 
 __all__ = ['ControllerServer']
 

diff --git a/paddleslim/prune/lock.py → paddleslim/common/lock.py b/paddleslim/prune/lock.py → paddleslim/common/lock.py
diff --git a/paddleslim/common/lock_utils.py b/paddleslim/common/lock_utils.py
diff --git a/paddleslim/prune/__init__.py b/paddleslim/prune/__init__.py
@@ -15,10 +15,6 @@
 import pruner
 from .auto_pruner import *
 import auto_pruner
-from .controller_server import *
-import controller_server
-from .controller_client import *
-import controller_client
 from .sensitive_pruner import *
 import sensitive_pruner
 from .sensitive import *
@@ -32,8 +28,6 @@
 
 __all__ += pruner.__all__
 __all__ += auto_pruner.__all__
-__all__ += controller_server.__all__
-__all__ += controller_client.__all__
 __all__ += sensitive_pruner.__all__
 __all__ += sensitive.__all__
 __all__ += prune_walker.__all__

diff --git a/paddleslim/prune/auto_pruner.py b/paddleslim/prune/auto_pruner.py
@@ -157,7 +157,7 @@ def _get_range_table(self, min_ratios, max_ratios):
 
     def _constrain_func(self, tokens):
         ratios = self._tokens2ratios(tokens)
-        pruned_program = self._pruner.prune(
+        pruned_program, _, _ = self._pruner.prune(
             self._program,
             self._scope,
             self._params,
@@ -183,7 +183,7 @@ def prune(self, program, eval_program=None):
             Program: The pruned program.
         """
         self._current_ratios = self._next_ratios()
-        pruned_program = self._pruner.prune(
+        pruned_program, _, _ = self._pruner.prune(
             program,
             self._scope,
             self._params,
@@ -193,7 +193,7 @@ def prune(self, program, eval_program=None):
             param_backup=self._param_backup)
         pruned_val_program = None
         if eval_program is not None:
-            pruned_val_program = self._pruner.prune(
+            pruned_val_program, _, _ = self._pruner.prune(
                 program,
                 self._scope,
                 self._params,

diff --git a/paddleslim/prune/controller_client.py b/paddleslim/prune/controller_client.py
diff --git a/paddleslim/prune/controller_server.py b/paddleslim/prune/controller_server.py