From db3844e2ecb2fe83ff0fe8450c88d9300ac7f0ad Mon Sep 17 00:00:00 2001 From: h00613304 Date: Fri, 4 Aug 2023 16:14:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=A8=A1=E5=9E=8Binit?= =?UTF-8?q?=E9=98=B6=E6=AE=B5dump=20json=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api_accuracy_checker/dump/__init__.py | 5 +--- .../api_accuracy_checker/dump/dump.py | 29 +++++++++++++++++-- .../api_accuracy_checker/dump/utils.py | 23 --------------- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py b/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py index d2c12a0e52..de0ec6ee74 100644 --- a/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py +++ b/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py @@ -1,10 +1,7 @@ -from api_accuracy_checker.hook_module.register_hook import initialize_hook -from api_accuracy_checker.dump.dump import pretest_hook -from api_accuracy_checker.dump.info_dump import initialize_output_json from api_accuracy_checker.dump.utils import set_dump_switch initialize_hook(pretest_hook) initialize_output_json() -__all__ = ['set_dump_switch', 'msCheckerConfig'] \ No newline at end of file +__all__ = ['set_dump_switch'] \ No newline at end of file diff --git a/debug/accuracy_tools/api_accuracy_checker/dump/dump.py b/debug/accuracy_tools/api_accuracy_checker/dump/dump.py index e69c4b50ef..b5d8c06b1c 100644 --- a/debug/accuracy_tools/api_accuracy_checker/dump/dump.py +++ b/debug/accuracy_tools/api_accuracy_checker/dump/dump.py @@ -25,9 +25,34 @@ import threading from api_accuracy_checker.dump.api_info import ForwardAPIInfo, BackwardAPIInfo -from api_accuracy_checker.dump.info_dump import write_api_info_json -from api_accuracy_checker.dump.utils import DumpConst, DumpUtil +from api_accuracy_checker.dump.info_dump import write_api_info_json, initialize_output_json from api_accuracy_checker.common.utils import print_warn_log, print_info_log, print_error_log +from api_accuracy_checker.hook_module.register_hook import initialize_hook + + +def set_dump_switch(switch): + if switch == "ON": + initialize_hook(pretest_hook) + initialize_output_json() + DumpUtil.set_dump_switch(switch) + +class DumpUtil(object): + dump_switch = None + + @staticmethod + def set_dump_switch(switch): + DumpUtil.dump_switch = switch + + @staticmethod + def get_dump_switch(): + return DumpUtil.dump_switch == "ON" + + +class DumpConst: + delimiter = '*' + forward = 'forward' + backward = 'backward' + def pretest_info_dump(name, out_feat, module, phase): if not DumpUtil.dump_switch: diff --git a/debug/accuracy_tools/api_accuracy_checker/dump/utils.py b/debug/accuracy_tools/api_accuracy_checker/dump/utils.py index 4a19785b61..93af6f0981 100644 --- a/debug/accuracy_tools/api_accuracy_checker/dump/utils.py +++ b/debug/accuracy_tools/api_accuracy_checker/dump/utils.py @@ -1,15 +1,6 @@ import os -import shutil -import sys -from pathlib import Path import numpy as np -from api_accuracy_checker.common.utils import print_error_log, CompareException, DumpException, Const, get_time, print_info_log, \ - check_mode_valid, get_api_name_from_matcher -class DumpConst: - delimiter = '*' - forward = 'forward' - backward = 'backward' def create_folder(path): if not os.path.exists(path): @@ -22,17 +13,3 @@ def write_npy(file_path, tensor): np.save(file_path, tensor) full_path = os.path.abspath(file_path) return full_path - -def set_dump_switch(switch): - DumpUtil.set_dump_switch(switch) - -class DumpUtil(object): - dump_switch = None - - @staticmethod - def set_dump_switch(switch): - DumpUtil.dump_switch = switch - - @staticmethod - def get_dump_switch(): - return DumpUtil.dump_switch == "ON" \ No newline at end of file -- Gitee From f2785a7084e88856931ab98e2d98820f3f7b0e7a Mon Sep 17 00:00:00 2001 From: h00613304 Date: Fri, 4 Aug 2023 17:40:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4init=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=97=A0=E7=94=A8=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug/accuracy_tools/api_accuracy_checker/dump/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py b/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py index de0ec6ee74..bc6e6c493b 100644 --- a/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py +++ b/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py @@ -1,7 +1,4 @@ from api_accuracy_checker.dump.utils import set_dump_switch -initialize_hook(pretest_hook) -initialize_output_json() - __all__ = ['set_dump_switch'] \ No newline at end of file -- Gitee From 72b7a92399cd5fe5e33fa37679fa1f9edeead966 Mon Sep 17 00:00:00 2001 From: h00613304 Date: Fri, 4 Aug 2023 17:59:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dset=5Fdump=5Fswitch?= =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug/accuracy_tools/api_accuracy_checker/dump/__init__.py | 2 +- debug/accuracy_tools/api_accuracy_checker/dump/dump.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py b/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py index bc6e6c493b..73ec798853 100644 --- a/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py +++ b/debug/accuracy_tools/api_accuracy_checker/dump/__init__.py @@ -1,4 +1,4 @@ from api_accuracy_checker.dump.utils import set_dump_switch -__all__ = ['set_dump_switch'] \ No newline at end of file +__all__ = ['set_dump_switch'] diff --git a/debug/accuracy_tools/api_accuracy_checker/dump/dump.py b/debug/accuracy_tools/api_accuracy_checker/dump/dump.py index b5d8c06b1c..8098f25db0 100644 --- a/debug/accuracy_tools/api_accuracy_checker/dump/dump.py +++ b/debug/accuracy_tools/api_accuracy_checker/dump/dump.py @@ -55,7 +55,7 @@ class DumpConst: def pretest_info_dump(name, out_feat, module, phase): - if not DumpUtil.dump_switch: + if not DumpUtil.get_dump_switch(): return if phase == DumpConst.forward: api_info = ForwardAPIInfo(name, module.input_args, module.input_kwargs) -- Gitee