From d20403ccf9c8c17f3387379b6a6dc6663ea6d5bd Mon Sep 17 00:00:00 2001 From: wangchao426 Date: Sat, 28 Jun 2025 10:07:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90bugfix=E3=80=91=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=88=86=E6=9E=90=E6=95=B4=E7=BD=91=E9=A6=96=E6=BA=A2=E5=87=BA?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=97=B6=E5=88=86=E7=BB=84=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug/accuracy_tools/msprobe/nan_analyze/analyzer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug/accuracy_tools/msprobe/nan_analyze/analyzer.py b/debug/accuracy_tools/msprobe/nan_analyze/analyzer.py index e147f23b7c7..a32ad7c351c 100644 --- a/debug/accuracy_tools/msprobe/nan_analyze/analyzer.py +++ b/debug/accuracy_tools/msprobe/nan_analyze/analyzer.py @@ -221,7 +221,7 @@ class NanAnalyzer: node = get_next_node(nodes) if not node: continue - if not groups or node.node_id in all_ids_in_groups: + if not groups or node.node_id not in all_ids_in_groups: new_group = find_all_members(node) groups.append(new_group) all_ids_in_groups.update(new_group) -- Gitee From 1584ca164e8a44b2ae5308847dcfb65e9b8a7540 Mon Sep 17 00:00:00 2001 From: wangchao426 Date: Sat, 28 Jun 2025 11:03:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E6=80=A7=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=A4=A7=E5=B0=8F=E5=86=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug/accuracy_tools/msprobe/visualization/graph_service.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debug/accuracy_tools/msprobe/visualization/graph_service.py b/debug/accuracy_tools/msprobe/visualization/graph_service.py index b14ccab0386..a9f7870beab 100644 --- a/debug/accuracy_tools/msprobe/visualization/graph_service.py +++ b/debug/accuracy_tools/msprobe/visualization/graph_service.py @@ -66,7 +66,7 @@ def _compare_graph_result(input_param, args): # 对两个数据进行构图 graph_n = _build_graph_info(input_param.get('npu_path'), args) graph_b = _build_graph_info(input_param.get('bench_path'), args) - logger.info('Model graphs built successfully, start Comparing graphs...') + logger.info('Model graphs built successfully, start comparing graphs...') # 基于graph、stack和data进行比较 graph_comparator = _compare_graph(graph_n, graph_b, input_param, args) # 增加micro step标记 -- Gitee From 8dd6c85d403f68f1f20705c8726ed117f4295cc6 Mon Sep 17 00:00:00 2001 From: wangchao426 Date: Mon, 30 Jun 2025 11:35:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=9E=90?= =?UTF-8?q?=E9=A6=96=E5=BC=82=E5=B8=B8=E8=8A=82=E7=82=B9=E6=9E=84=E5=9B=BE?= =?UTF-8?q?=E6=97=B6layer=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../msprobe/nan_analyze/graph.py | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/debug/accuracy_tools/msprobe/nan_analyze/graph.py b/debug/accuracy_tools/msprobe/nan_analyze/graph.py index 5a4f8fb8729..cb6ec29a75b 100644 --- a/debug/accuracy_tools/msprobe/nan_analyze/graph.py +++ b/debug/accuracy_tools/msprobe/nan_analyze/graph.py @@ -99,13 +99,13 @@ class CommunicationNode: self.link_nodes = kwargs.get('link_nodes', {}) self.dst_nodes = kwargs.get('dst_nodes', {}) self.src_nodes = kwargs.get('src_nodes', {}) - self.next_nodes = kwargs.get('next_nodes', {}) + self.next_node = kwargs.get('next_node') self.compute_ops = kwargs.get('compute_ops', []) self.type = self._resolve_type() self.connected = False def add_next(self, node): - self.next_nodes[node.node_id] = node + self.next_node = node node.pre_node = self node.layer = self.layer + 1 node.data.layer = node.layer @@ -113,7 +113,9 @@ class CommunicationNode: def add_link(self, node): self.link_nodes[node.node_id] = node node.link_nodes[self.node_id] = self - node.layer = self.layer + layer = max(node.layer, self.layer) + self.update_layer(layer) + node.update_layer(layer) node.data.layer = node.layer self.connected = True node.connected = True @@ -121,14 +123,16 @@ class CommunicationNode: def add_dst(self, node): self.dst_nodes[node.node_id] = node node.src_nodes[self.node_id] = self - node.layer = self.layer + layer = max(node.layer, self.layer) + self.update_layer(layer) + node.update_layer(layer) node.data.layer = node.layer self.connected = True node.connected = True def delete(self): - for node in self.next_nodes.values(): - node.pre_node = None + if self.next_node: + self.next_node.pre_node = None for node in self.dst_nodes.values(): node.src_nodes.pop(self.node_id) for node in self.src_nodes.values(): @@ -138,9 +142,19 @@ class CommunicationNode: if self.pre_node: self.pre_node.next_nodes.pop(self.node_id) + def update_layer(self, layer): + if layer == self.layer: + return + self.layer = layer + next_node = self.next_node + while next_node: + layer += 1 + next_node.layer = layer + next_node = next_node.next_node + def has_nan_inf(self): return self.input_has_nan_inf() or check_item_anomaly(self.data.outputs) - + def input_has_nan_inf(self): return check_item_anomaly(self.data.input_args) or check_item_anomaly(self.data.input_kwargs) -- Gitee From d9bac2f6a05bc435175ee18a33d7aef571d8194c Mon Sep 17 00:00:00 2001 From: wangchao426 Date: Mon, 30 Jun 2025 15:43:05 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=9E=90?= =?UTF-8?q?=E9=A6=96=E5=BC=82=E5=B8=B8=E8=8A=82=E7=82=B9=E6=9E=84=E5=9B=BE?= =?UTF-8?q?=E6=97=B6layer=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug/accuracy_tools/msprobe/nan_analyze/graph.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debug/accuracy_tools/msprobe/nan_analyze/graph.py b/debug/accuracy_tools/msprobe/nan_analyze/graph.py index cb6ec29a75b..2dd9ae70f81 100644 --- a/debug/accuracy_tools/msprobe/nan_analyze/graph.py +++ b/debug/accuracy_tools/msprobe/nan_analyze/graph.py @@ -145,11 +145,19 @@ class CommunicationNode: def update_layer(self, layer): if layer == self.layer: return + + def update_comm_layer(node): + nodes = set(node.src_nodes.values()) | set(node.dst_nodes.values()) | set(node.link_nodes.values()) + for comm_node in nodes: + comm_node.update_layer(layer) + self.layer = layer + update_comm_layer(self) next_node = self.next_node while next_node: layer += 1 next_node.layer = layer + update_comm_layer(next_node) next_node = next_node.next_node def has_nan_inf(self): -- Gitee From 6e637d2a8e05ae0a303aa1273e69929c079b2ba7 Mon Sep 17 00:00:00 2001 From: wangchao426 Date: Mon, 30 Jun 2025 15:49:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E6=9E=90?= =?UTF-8?q?=E9=A6=96=E5=BC=82=E5=B8=B8=E8=8A=82=E7=82=B9=E6=9E=84=E5=9B=BE?= =?UTF-8?q?=E6=97=B6layer=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug/accuracy_tools/msprobe/nan_analyze/graph.py | 2 +- .../msprobe/test/nan_analyze_ut/test_nan_analyzer_graph.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debug/accuracy_tools/msprobe/nan_analyze/graph.py b/debug/accuracy_tools/msprobe/nan_analyze/graph.py index 2dd9ae70f81..979e9e296ae 100644 --- a/debug/accuracy_tools/msprobe/nan_analyze/graph.py +++ b/debug/accuracy_tools/msprobe/nan_analyze/graph.py @@ -140,7 +140,7 @@ class CommunicationNode: for node in self.link_nodes.values(): node.link_nodes.pop(self.node_id) if self.pre_node: - self.pre_node.next_nodes.pop(self.node_id) + self.pre_node.next_node = None def update_layer(self, layer): if layer == self.layer: diff --git a/debug/accuracy_tools/msprobe/test/nan_analyze_ut/test_nan_analyzer_graph.py b/debug/accuracy_tools/msprobe/test/nan_analyze_ut/test_nan_analyzer_graph.py index 3c1c43b3b10..50dc6cba838 100644 --- a/debug/accuracy_tools/msprobe/test/nan_analyze_ut/test_nan_analyzer_graph.py +++ b/debug/accuracy_tools/msprobe/test/nan_analyze_ut/test_nan_analyzer_graph.py @@ -37,7 +37,7 @@ class TestCommunicationNode(unittest.TestCase): comm_node_0.add_next(comm_node_1) self.assertEqual(comm_node_0.layer + 1, comm_node_1.layer) self.assertTrue(comm_node_0 is comm_node_1.pre_node) - self.assertTrue(comm_node_1.node_id in comm_node_0.next_nodes) + self.assertTrue(comm_node_0.next_node is comm_node_1) def test_add_link(self): op_name = 'Distributed.all_gather.0.forward' @@ -67,7 +67,7 @@ class TestCommunicationNode(unittest.TestCase): comm_node_0.add_dst(comm_node_1) comm_node_0.delete() self.assertFalse(comm_node_1.src_nodes) - self.assertFalse(comm_node_2.next_nodes) + self.assertFalse(comm_node_2.next_node) def test_has_nan_inf(self): op_name = 'Distributed.broadcast.0.forward' -- Gitee