Merge branch 'fix_controller' into 'develop'

Fix controller server.

See merge request !22

paddleslim/common/controller_server.py

@@ -17,7 +17,7 @@ import logging
 import socket
 from .log_helper import get_logger
 from threading import Thread
-from .lock import lock, unlock
+from .lock_utils import lock, unlock
 
 __all__ = ['ControllerServer']