Browse Source

kernel build server process support to print log

Signed-off-by: zhoufeng <zhoufeng54@huawei.com>
tags/v1.2.0-rc1
zhoufeng 4 years ago
parent
commit
db7a2897dd
3 changed files with 13 additions and 63 deletions
  1. +5
    -55
      mindspore/_extends/remote/kernel_build_server.py
  2. +5
    -5
      mindspore/_extends/remote/kernel_build_server_ascend.py
  3. +3
    -3
      mindspore/_extends/remote/kernel_build_server_gpu.py

+ 5
- 55
mindspore/_extends/remote/kernel_build_server.py View File

@@ -14,7 +14,7 @@
# ============================================================================ # ============================================================================
"""kernel build server""" """kernel build server"""
import os import os
import time
from mindspore import log as logger


class Messager: class Messager:
'''Messager''' '''Messager'''
@@ -41,12 +41,12 @@ class Messager:
# Not read by input() anymore # Not read by input() anymore
res = self.fin.readline() res = self.fin.readline()
if not res: if not res:
logger.debug('[TRACE]', "read nothing...")
logger.debug("[TRACE] read nothing...")
self.exit() self.exit()
if res[len(res) - 1] == '\n': if res[len(res) - 1] == '\n':
res = res[0:len(res)-1] res = res[0:len(res)-1]
self.message = res self.message = res
logger.debug('[IN]', self.message)
logger.debug(f"[IN] {self.message}")
except (EOFError, KeyboardInterrupt): except (EOFError, KeyboardInterrupt):
self.exit() self.exit()
finally: finally:
@@ -63,7 +63,7 @@ class Messager:
Args: Args:
keep_format: True or False keep_format: True or False
""" """
logger.debug('[OUT]', str(res))
logger.debug(f"[OUT] {str(res)}")
if keep_format: if keep_format:
res_str = str(res).replace('\n', '[LF]').replace('\r', '[CR]').replace(' ', '[SP]') res_str = str(res).replace('\n', '[LF]').replace('\r', '[CR]').replace(' ', '[SP]')
else: else:
@@ -75,7 +75,7 @@ class Messager:
self.fout.write(tag + res_str + "\n") self.fout.write(tag + res_str + "\n")
self.fout.flush() self.fout.flush()
except BrokenPipeError as err: except BrokenPipeError as err:
logger.info('[TRACE]', 'Write, ' + str(err))
logger.info(f"[TRACE] Write {str(err)}")
self.exit() self.exit()
finally: finally:
pass pass
@@ -120,55 +120,5 @@ class Messager:
""" """
raise NotImplementedError 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(): def get_logger():
return logger return logger

+ 5
- 5
mindspore/_extends/remote/kernel_build_server_ascend.py View File

@@ -62,7 +62,7 @@ class AscendMessager(Messager):


def __init__(self, fdin, fdout): def __init__(self, fdin, fdout):
super().__init__(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.tbe_builder = TbeBuilder()
self.akg_builder = AkgBuilder() self.akg_builder = AkgBuilder()


@@ -83,7 +83,7 @@ class AscendMessager(Messager):
elif arg == 'TBE/WAIT': elif arg == 'TBE/WAIT':
self.send_ack() self.send_ack()
task_id, res, pre = self.tbe_builder.wait() 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': if self.get_message() != 'CONTINUE':
self.send_ack(False) self.send_ack(False)
self.exit() self.exit()
@@ -127,7 +127,7 @@ class AscendMessager(Messager):
elif arg == 'SUPPORT': elif arg == 'SUPPORT':
self.send_ack() self.send_ack()
json = self.get_message() json = self.get_message()
get_logger().debug('[SUPPORT]', json)
get_logger().debug(f"[SUPPORT] {json}")
try: try:
res = check_supported(json) res = check_supported(json)
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
@@ -143,12 +143,12 @@ class AscendMessager(Messager):
def exit(self): def exit(self):
self.tbe_builder.reset() self.tbe_builder.reset()
self.tbe_builder.exit() self.tbe_builder.exit()
get_logger().info('[TRACE]', 'Ascend Messager Exit...')
get_logger().info("[TRACE] Ascend Messager Exit...")
exit() exit()


if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) != 3: if len(sys.argv) != 3:
raise Exception('Incorrect argv: {}'.format(sys.argv)) 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 = AscendMessager(int(sys.argv[1]), int(sys.argv[2]))
messager.run() messager.run()

+ 3
- 3
mindspore/_extends/remote/kernel_build_server_gpu.py View File

@@ -26,7 +26,7 @@ class GpuMessager(Messager):


def __init__(self, fdin, fdout): def __init__(self, fdin, fdout):
super().__init__(fdin, fdout) super().__init__(fdin, fdout)
get_logger().info('[TRACE]', 'GPU Messager init...')
get_logger().info("[TRACE] GPU Messager init...")


def handle(self): def handle(self):
""" """
@@ -52,12 +52,12 @@ class GpuMessager(Messager):
self.exit() self.exit()


def exit(self): def exit(self):
get_logger().info('[TRACE]', 'GPU Messager Exit...')
get_logger().info("[TRACE] GPU Messager Exit...")
exit() exit()


if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) != 3: if len(sys.argv) != 3:
raise Exception('Incorrect argv: {}'.format(sys.argv)) 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 = GpuMessager(int(sys.argv[1]), int(sys.argv[2]))
messager.run() messager.run()

Loading…
Cancel
Save