From fd366be1e3328b45f4f15860bf015c64037f6376 Mon Sep 17 00:00:00 2001 From: l30044004 Date: Thu, 26 Jun 2025 14:38:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BA=A7=E5=8F=AF=E8=A7=86=E5=8C=96?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=BB=9F=E4=B8=80=E7=9A=84load=20json?= =?UTF-8?q?=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test_visualization_utils.py | 11 +-------- .../visualization/compare/graph_comparator.py | 10 ++++---- .../msprobe/visualization/utils.py | 23 ------------------- 3 files changed, 6 insertions(+), 38 deletions(-) diff --git a/debug/accuracy_tools/msprobe/test/visualization_ut/test_visualization_utils.py b/debug/accuracy_tools/msprobe/test/visualization_ut/test_visualization_utils.py index 974fcdf8a19..81b87a11781 100644 --- a/debug/accuracy_tools/msprobe/test/visualization_ut/test_visualization_utils.py +++ b/debug/accuracy_tools/msprobe/test/visualization_ut/test_visualization_utils.py @@ -1,7 +1,6 @@ import os import unittest -from msprobe.visualization.utils import (load_json_file, load_data_json_file, str2float, check_directory_content, - GraphConst, SerializableArgs) +from msprobe.visualization.utils import (str2float, check_directory_content, GraphConst, SerializableArgs) class TestMappingConfig(unittest.TestCase): @@ -10,14 +9,6 @@ class TestMappingConfig(unittest.TestCase): self.yaml_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), "mapping.yaml") self.input = os.path.join(os.path.dirname(os.path.realpath(__file__)), "input") - def test_load_json_file(self): - result = load_json_file(self.yaml_path) - self.assertEqual(result, {}) - - def test_load_data_json_file(self): - result = load_data_json_file(self.yaml_path) - self.assertEqual(result, {}) - def test_str2float(self): result = str2float('23.4%') self.assertAlmostEqual(result, 0.234) diff --git a/debug/accuracy_tools/msprobe/visualization/compare/graph_comparator.py b/debug/accuracy_tools/msprobe/visualization/compare/graph_comparator.py index 5c8a489245b..ac6c9c3ecca 100644 --- a/debug/accuracy_tools/msprobe/visualization/compare/graph_comparator.py +++ b/debug/accuracy_tools/msprobe/visualization/compare/graph_comparator.py @@ -15,11 +15,11 @@ import re from msprobe.visualization.builder.msprobe_adapter import compare_node, get_compare_mode, run_real_data, get_csv_df -from msprobe.visualization.utils import GraphConst, load_json_file, load_data_json_file +from msprobe.visualization.utils import GraphConst from msprobe.visualization.graph.graph import Graph, NodeOp from msprobe.visualization.compare.mode_adapter import ModeAdapter from msprobe.core.common.const import Const -from msprobe.core.common.decorator import recursion_depth_decorator +from msprobe.core.common.file_utils import load_json class GraphComparator: @@ -129,9 +129,9 @@ class GraphComparator: self.output_path = output_path compare_mode = get_compare_mode(self.dump_path_param) self.ma = ModeAdapter(compare_mode) - self.data_n_dict = load_data_json_file(dump_path_param.get('npu_json_path')) - self.data_b_dict = load_data_json_file(dump_path_param.get('bench_json_path')) - self.stack_json_data = load_json_file(dump_path_param.get('stack_json_path')) + self.data_n_dict = load_json(dump_path_param.get('npu_json_path')).get(GraphConst.DATA_KEY, {}) + self.data_b_dict = load_json(dump_path_param.get('bench_json_path')).get(GraphConst.DATA_KEY, {}) + self.stack_json_data = load_json(dump_path_param.get('stack_json_path')) def _postcompare(self): self._handle_api_collection_index() diff --git a/debug/accuracy_tools/msprobe/visualization/utils.py b/debug/accuracy_tools/msprobe/visualization/utils.py index 52a5a52fc3e..d682af3c2a8 100644 --- a/debug/accuracy_tools/msprobe/visualization/utils.py +++ b/debug/accuracy_tools/msprobe/visualization/utils.py @@ -16,35 +16,12 @@ import os import re import pickle -import json -from msprobe.core.common.file_utils import FileOpen from msprobe.core.common.const import CompareConst, Const from msprobe.core.common.log import logger from msprobe.core.common.exceptions import MsprobeException from msprobe.core.compare.utils import check_and_return_dir_contents -def load_json_file(file_path): - """ - 加载json文件 - """ - try: - with FileOpen(file_path, 'r') as f: - file_dict = json.load(f) - if not isinstance(file_dict, dict): - return {} - return file_dict - except json.JSONDecodeError: - return {} - - -def load_data_json_file(file_path): - """ - 加载dump.json中的data字段 - """ - return load_json_file(file_path).get(GraphConst.DATA_KEY, {}) - - def str2float(percentage_str): """ 百分比字符串转换转换为浮点型 -- Gitee