diff --git a/debug/accuracy_tools/msprobe/nan_analyze/analyzer.py b/debug/accuracy_tools/msprobe/nan_analyze/analyzer.py index e147f23b7c7bd514a13251830e0365928876bc75..04f2b27f43bab348ab4424408bb3a1778f04796a 100644 --- a/debug/accuracy_tools/msprobe/nan_analyze/analyzer.py +++ b/debug/accuracy_tools/msprobe/nan_analyze/analyzer.py @@ -83,6 +83,7 @@ class NanAnalyzer: logger.info('Start searching anomaly node during communication.') self._rank_comm_nodes_dict = {rank: self._analyze_comm_nodes(rank) for rank in self._paths} self._connect_comm_nodes() + self._verify_layers() self._pruning() self._search_first_anomaly() @@ -151,7 +152,6 @@ class NanAnalyzer: if search_node.type == NanAnalyseConst.DST: cur_node.add_dst(search_node) elif search_node.type == NanAnalyseConst.SRC: - search_node.layer = cur_node.layer search_node.add_dst(cur_node) else: cur_node.add_link(search_node) @@ -174,6 +174,25 @@ class NanAnalyzer: break return found + def _verify_layers(self): + nodes_queues = {rank: list(nodes.values()) for rank, nodes in self._rank_comm_nodes_dict.items()} + cur_layer = 0 + while any(nodes_queues.values()): + cur_batch = [nodes_queue.pop(0) for nodes_queue in nodes_queues.values() if nodes_queue] + for node in cur_batch: + relatives = {**node.src_nodes, **node.dst_nodes, **node.link_nodes} + max_layer = max([n.layer for n in relatives.values()] + [node.layer]) + if max_layer != cur_layer or set(relatives.keys()).difference({n.node_id for n in cur_batch}): + node.layer = max_layer + rank = int(node.node_id.split(Const.SEP, 1)[0]) + nodes_queues[rank].insert(0, node) + else: + node.layer = cur_layer + node.data.layer = cur_layer + if node.next_node: + node.next_node.layer = node.layer + 1 + cur_layer += 1 + def _pruning(self): deleted_node_id = [] for nodes in self._rank_comm_nodes_dict.values(): @@ -221,7 +240,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) diff --git a/debug/accuracy_tools/msprobe/nan_analyze/graph.py b/debug/accuracy_tools/msprobe/nan_analyze/graph.py index 13ec61444734b0ebff9c8174bc3aaf36d0f94c4e..862bc141cb9f07dcd4db45b4a1ab518cd2c6fd4f 100644 --- a/debug/accuracy_tools/msprobe/nan_analyze/graph.py +++ b/debug/accuracy_tools/msprobe/nan_analyze/graph.py @@ -16,8 +16,8 @@ from dataclasses import dataclass from msprobe.core.common.const import Const from msprobe.core.common.log import logger -from msprobe.nan_analyze.utils import FileCache, RankPath, is_ignore_op, check_item_anomaly, NanAnalyseConst from msprobe.core.common.exceptions import MsprobeException +from msprobe.nan_analyze.utils import FileCache, RankPath, is_ignore_op, check_item_anomaly, NanAnalyseConst @dataclass @@ -96,16 +96,16 @@ class CommunicationNode: self.api = op_name_split[1] self.call_cnt = op_name_split[2] self.pre_node = kwargs.get('pre_node') + self.next_node = kwargs.get('next_node') 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.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,22 +113,18 @@ 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 - node.data.layer = node.layer self.connected = True node.connected = True def add_dst(self, node): self.dst_nodes[node.node_id] = node node.src_nodes[self.node_id] = self - node.layer = self.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(): @@ -136,11 +132,11 @@ 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 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) 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 9bd3777ab6eb51de763a7c42d7cea98a0a4139d0..ead3da12ff69e460811fbfd1feedbfa974d7cf6f 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 @@ -38,7 +38,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' @@ -68,7 +68,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' diff --git a/debug/accuracy_tools/msprobe/visualization/graph_service.py b/debug/accuracy_tools/msprobe/visualization/graph_service.py index b14ccab0386be92c0cdce7ebc89854a9ce17aa92..a9f7870beabd04658b395e3349dd0be416af27f5 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标记