diff --git a/mindspore/_extends/remote/kernel_build_server.py b/mindspore/_extends/remote/kernel_build_server.py index 171b76ae2b..49989e62d7 100644 --- a/mindspore/_extends/remote/kernel_build_server.py +++ b/mindspore/_extends/remote/kernel_build_server.py @@ -14,7 +14,7 @@ # ============================================================================ """kernel build server""" import os -import time +from mindspore import log as logger class Messager: '''Messager''' @@ -41,12 +41,12 @@ class Messager: # Not read by input() anymore res = self.fin.readline() if not res: - logger.debug('[TRACE]', "read nothing...") + logger.debug("[TRACE] read nothing...") self.exit() if res[len(res) - 1] == '\n': res = res[0:len(res)-1] self.message = res - logger.debug('[IN]', self.message) + logger.debug(f"[IN] {self.message}") except (EOFError, KeyboardInterrupt): self.exit() finally: @@ -63,7 +63,7 @@ class Messager: Args: keep_format: True or False """ - logger.debug('[OUT]', str(res)) + logger.debug(f"[OUT] {str(res)}") if keep_format: res_str = str(res).replace('\n', '[LF]').replace('\r', '[CR]').replace(' ', '[SP]') else: @@ -75,7 +75,7 @@ class Messager: self.fout.write(tag + res_str + "\n") self.fout.flush() except BrokenPipeError as err: - logger.info('[TRACE]', 'Write, ' + str(err)) + logger.info(f"[TRACE] Write {str(err)}") self.exit() finally: pass @@ -120,55 +120,5 @@ class Messager: """ raise NotImplementedError -class Logger: - """ - Replace dummy 'logger' to output log as below: - logger = Logger(0, True, "remote_kernel_build_" + time.strftime("%Y_%m_%d_%H_%M_%S", time.localtime()) + ".log") - """ - def __init__(self, level=1, dumpfile=False, filename='Logger.log'): - """ - Args: - level: 0 for debug and info, 1 for info - dumpfile: if dump log into file - """ - self.level = level - self.dumpfile = dumpfile - if self.dumpfile: - self.log = open(filename, "a") - - def write(self, msg): - self.log.write(msg) - self.flush() - - def writeline(self, tag, msg): - prefix = tag + ' REMOTE(' + str(os.getpid()) + ',python)' - line = prefix + '\t' + time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) + ':\t' + msg - print(line, flush=True) - if self.dumpfile: - self.write(line + '\n') - - def debug(self, tag, msg): - if self.level == 0: - self.writeline('[DEBUG]' + tag, msg) - - def info(self, tag, msg): - self.writeline('[INFO]' + tag, msg) - - def flush(self): - self.log.flush() - -class DummyLogger: - """DummyLogger""" - def __init__(self): - pass - - def debug(self, tag, msg): - pass - - def info(self, tag, msg): - pass - -logger = DummyLogger() - def get_logger(): return logger diff --git a/mindspore/_extends/remote/kernel_build_server_ascend.py b/mindspore/_extends/remote/kernel_build_server_ascend.py index 60f6421ac6..1dc513551c 100644 --- a/mindspore/_extends/remote/kernel_build_server_ascend.py +++ b/mindspore/_extends/remote/kernel_build_server_ascend.py @@ -62,7 +62,7 @@ class AscendMessager(Messager): def __init__(self, fdin, fdout): super().__init__(fdin, fdout) - get_logger().info('[TRACE]', 'Ascend Messager init...') + get_logger().info("[TRACE] Ascend Messager init...") self.tbe_builder = TbeBuilder() self.akg_builder = AkgBuilder() @@ -83,7 +83,7 @@ class AscendMessager(Messager): elif arg == 'TBE/WAIT': self.send_ack() task_id, res, pre = self.tbe_builder.wait() - get_logger().debug('[TRACE]', str(task_id) + '/' + str(res) + '/' + str(pre)) + get_logger().debug(f"[TRACE] {str(task_id)} / {str(res)} / {str(pre)}") if self.get_message() != 'CONTINUE': self.send_ack(False) self.exit() @@ -127,7 +127,7 @@ class AscendMessager(Messager): elif arg == 'SUPPORT': self.send_ack() json = self.get_message() - get_logger().debug('[SUPPORT]', json) + get_logger().debug(f"[SUPPORT] {json}") try: res = check_supported(json) except json.decoder.JSONDecodeError: @@ -143,12 +143,12 @@ class AscendMessager(Messager): def exit(self): self.tbe_builder.reset() self.tbe_builder.exit() - get_logger().info('[TRACE]', 'Ascend Messager Exit...') + get_logger().info("[TRACE] Ascend Messager Exit...") exit() if __name__ == '__main__': if len(sys.argv) != 3: raise Exception('Incorrect argv: {}'.format(sys.argv)) - get_logger().debug('[TRACE]', 'argv: ' + str(sys.argv)) + get_logger().debug(f"[TRACE] argv: {str(sys.argv)}") messager = AscendMessager(int(sys.argv[1]), int(sys.argv[2])) messager.run() diff --git a/mindspore/_extends/remote/kernel_build_server_gpu.py b/mindspore/_extends/remote/kernel_build_server_gpu.py index 8bdf5805af..dc625c8b0d 100644 --- a/mindspore/_extends/remote/kernel_build_server_gpu.py +++ b/mindspore/_extends/remote/kernel_build_server_gpu.py @@ -26,7 +26,7 @@ class GpuMessager(Messager): def __init__(self, fdin, fdout): super().__init__(fdin, fdout) - get_logger().info('[TRACE]', 'GPU Messager init...') + get_logger().info("[TRACE] GPU Messager init...") def handle(self): """ @@ -52,12 +52,12 @@ class GpuMessager(Messager): self.exit() def exit(self): - get_logger().info('[TRACE]', 'GPU Messager Exit...') + get_logger().info("[TRACE] GPU Messager Exit...") exit() if __name__ == '__main__': if len(sys.argv) != 3: raise Exception('Incorrect argv: {}'.format(sys.argv)) - get_logger().debug('[TRACE]', 'argv: ' + str(sys.argv)) + get_logger().debug(f"[TRACE] argv: {str(sys.argv)}") messager = GpuMessager(int(sys.argv[1]), int(sys.argv[2])) messager.run()