From b467a9de2cc4482b74544d6f3b76f4194fdc9edf Mon Sep 17 00:00:00 2001 From: wuyulong11 Date: Tue, 24 Oct 2023 16:57:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=20=E3=80=90tbplugin=E3=80=91=E3=80=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95=E3=80=91=E8=A1=A5=E5=85=85=E5=85=AC?= =?UTF-8?q?=E7=BD=91URL=E8=AF=B4=E6=98=8E=20=E3=80=90=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=BA=E3=80=91=20wuyulong=2030031080?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/tensorboard-plugins/tb_plugin/README.md | 6 +++++- ...347\275\221URL\350\257\264\346\230\216.xlsx" | Bin 0 -> 14913 bytes .../tb_plugin/fe/src/components/ModuleView.tsx | 5 ----- 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 "plugins/tensorboard-plugins/tb_plugin/docs/\345\205\254\347\275\221URL\350\257\264\346\230\216.xlsx" diff --git a/plugins/tensorboard-plugins/tb_plugin/README.md b/plugins/tensorboard-plugins/tb_plugin/README.md index 93c40c443d..c2c5c2aee9 100644 --- a/plugins/tensorboard-plugins/tb_plugin/README.md +++ b/plugins/tensorboard-plugins/tb_plugin/README.md @@ -248,4 +248,8 @@ Workers-Spans: 多线程的情况下Profiling可能包含多组数据，通过Wo | Elapse Time(us) | 此类算子总耗时。 | | Avg Elapse Time(us) | 单个算子平均耗时。 | | Transit Time(us) | 此类算子传输总耗时。 | - | Avg Transit Time(us) | 单个算子平均传输耗时。 | \ No newline at end of file + | Avg Transit Time(us) | 单个算子平均传输耗时。 | + +### 公网URL说明 + +[公网URL说明](./docs/公网URL说明.xlsx) \ No newline at end of file diff --git "a/plugins/tensorboard-plugins/tb_plugin/docs/\345\205\254\347\275\221URL\350\257\264\346\230\216.xlsx" "b/plugins/tensorboard-plugins/tb_plugin/docs/\345\205\254\347\275\221URL\350\257\264\346\230\216.xlsx" new file mode 100644 index 0000000000000000000000000000000000000000..4c6800ec528c8dc1cba44f006c79f0f4f64a027c GIT binary patch literal 14913 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 G_x}J^5N)9V literal 0 HcmV?d00001 diff --git a/plugins/tensorboard-plugins/tb_plugin/fe/src/components/ModuleView.tsx b/plugins/tensorboard-plugins/tb_plugin/fe/src/components/ModuleView.tsx index 38e5118c95..5b8ce92912 100644 --- a/plugins/tensorboard-plugins/tb_plugin/fe/src/components/ModuleView.tsx +++ b/plugins/tensorboard-plugins/tb_plugin/fe/src/components/ModuleView.tsx @@ -226,11 +226,6 @@ export const ModuleView: React.FC = (props) => {
- - {/* defaultExpandAllRows will only valid when first render the Table - if row is null, then it will be ignored so all data will be collapse. - see https://segmentfault.com/a/1190000007830998 for more information. - */} {rows && rows.length > 0 && ( Date: Fri, 27 Oct 2023 11:19:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E3=80=91=20=E3=80=90tbplugin=E3=80=91=E3=80=90issue?= =?UTF-8?q?=20#I8AI79=E3=80=91cleancode=E6=B8=85=E7=90=86=20=E3=80=90?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E3=80=91=20wuyulong=2030031080?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tb_plugin/fe/scripts/add_header.py | 10 ++--- .../tb_plugin/fe/update-static.js | 2 - .../tb_plugin/fe/webpack.config.js | 6 +-- .../tensorboard-plugins/tb_plugin/setup.py | 2 +- .../tb_plugin/torch_tb_profiler/io/base.py | 6 ++- .../tb_plugin/torch_tb_profiler/io/file.py | 10 ++--- .../tb_plugin/torch_tb_profiler/io/gs.py | 1 - .../torch_tb_profiler/profiler/data.py | 4 +- .../profiler/diffrun/operator.py | 4 +- .../profiler/diffrun/tree.py | 13 +++--- .../profiler/event_parser.py | 2 +- .../profiler/gpu_metrics_parser.py | 2 +- .../torch_tb_profiler/profiler/module_op.py | 14 +++---- .../torch_tb_profiler/profiler/node.py | 3 +- .../torch_tb_profiler/profiler/op_agg.py | 3 +- .../torch_tb_profiler/profiler/op_tree.py | 5 +-- .../profiler/overall_parser.py | 8 ++-- .../torch_tb_profiler/profiler/range_utils.py | 8 ++-- .../profiler/run_generator.py | 42 ++++++++++++------- .../torch_tb_profiler/profiler/trace.py | 4 +- .../tb_plugin/torch_tb_profiler/run.py | 28 ++++++------- .../tb_plugin/torch_tb_profiler/utils.py | 4 +- 22 files changed, 89 insertions(+), 92 deletions(-) diff --git a/plugins/tensorboard-plugins/tb_plugin/fe/scripts/add_header.py b/plugins/tensorboard-plugins/tb_plugin/fe/scripts/add_header.py index a36b606377..03fb7c15ae 100644 --- a/plugins/tensorboard-plugins/tb_plugin/fe/scripts/add_header.py +++ b/plugins/tensorboard-plugins/tb_plugin/fe/scripts/add_header.py @@ -24,9 +24,9 @@ def add_header(file): if __name__ == '__main__': - dir = sys.argv[1] - if not os.path.isdir(dir): - raise ValueError('{} is not a directory'.format(dir)) + directory = sys.argv[1] + if not os.path.isdir(directory): + raise ValueError('{} is not a directory'.format(directory)) - for file in glob.glob(dir + '/*.ts'): - add_header(file) + for ts_file in glob.glob(directory + '/*.ts'): + add_header(ts_file) diff --git a/plugins/tensorboard-plugins/tb_plugin/fe/update-static.js b/plugins/tensorboard-plugins/tb_plugin/fe/update-static.js index a4f59f7c7e..9923c21678 100644 --- a/plugins/tensorboard-plugins/tb_plugin/fe/update-static.js +++ b/plugins/tensorboard-plugins/tb_plugin/fe/update-static.js @@ -5,5 +5,3 @@ fs.copyFileSync( path.resolve(__dirname, 'dist/index.html'), path.resolve(__dirname, '../torch_tb_profiler/static/index.html') ) - -console.log('Copy done.') diff --git a/plugins/tensorboard-plugins/tb_plugin/fe/webpack.config.js b/plugins/tensorboard-plugins/tb_plugin/fe/webpack.config.js index 38a635b9a1..70541ae9cf 100644 --- a/plugins/tensorboard-plugins/tb_plugin/fe/webpack.config.js +++ b/plugins/tensorboard-plugins/tb_plugin/fe/webpack.config.js @@ -32,9 +32,5 @@ module.exports = { }), !isDev ? new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/.*/]) : undefined ].filter(Boolean), - devServer: { - // proxy: { - // '/data/plugin/pytorch_profiler': '' - // } - } + devServer: {} } diff --git a/plugins/tensorboard-plugins/tb_plugin/setup.py b/plugins/tensorboard-plugins/tb_plugin/setup.py index 7cc417e1cd..d6306d0b4f 100644 --- a/plugins/tensorboard-plugins/tb_plugin/setup.py +++ b/plugins/tensorboard-plugins/tb_plugin/setup.py @@ -20,8 +20,8 @@ # -------------------------------------------------------------------------- import os import pathlib -import setuptools import subprocess +import setuptools def read(rel_path): diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/base.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/base.py index d6f0a2f922..ab0a40f042 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/base.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/base.py @@ -86,8 +86,10 @@ class LocalPath(BasePath): class RemotePath(BasePath): def split(self, path): - """Split a pathname. Returns tuple '(head, tail)' where 'tail' is - everything after the final slash. Either part may be empty.""" + """ + Split a pathname. Returns tuple '(head, tail)' where 'tail' is + everything after the final slash. Either part may be empty. + """ sep = '/' i = path.rfind(sep) + 1 head, tail = path[:i], path[i:] diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/file.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/file.py index 97e4902f8f..dc9abb0568 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/file.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/file.py @@ -286,8 +286,8 @@ class S3FileSystem(RemotePath, BaseFileSystem): p = client.get_paginator("list_objects") keys = [] for r in p.paginate(Bucket=bucket, Prefix=path): - for o in r.get("Contents", []): - key = o["Key"][len(path):] + for content in r.get("Contents", []): + key = content["Key"][len(path):] if key: keys.append(filename + key) return keys @@ -313,10 +313,10 @@ class S3FileSystem(RemotePath, BaseFileSystem): keys = [] for r in p.paginate(Bucket=bucket, Prefix=path, Delimiter="/"): keys.extend( - o["Prefix"][len(path): -1] for o in r.get("CommonPrefixes", []) + prefixes["Prefix"][len(path): -1] for prefixes in r.get("CommonPrefixes", []) ) - for o in r.get("Contents", []): - key = o["Key"][len(path):] + for content in r.get("Contents", []): + key = content["Key"][len(path):] if key: keys.append(key) return keys diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/gs.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/gs.py index df1676f070..d3a4687732 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/gs.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/io/gs.py @@ -122,6 +122,5 @@ class GoogleBlobSystem(RemotePath, BaseFileSystem): return bucket, path def create_google_cloud_client(self): - # TODO: support client with credential? client = storage.Client.create_anonymous_client() return client diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/data.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/data.py index 2823d2b6bd..2290f805bd 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/data.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/data.py @@ -123,7 +123,7 @@ class RunProfileData(object): # npu memory data self.memory_operator_path: str = None self.memory_component_path: str = None - self.start_ts: float = 0 + self.start_ts: float = 0.0 # npu operator data self.operator_path: str = None @@ -356,7 +356,7 @@ class RunProfileData(object): continue total_mem = self.device_props[dev_id].get('totalGlobalMem') if total_mem is not None and peak_mem > total_mem * 0.9: - percentage = peak_mem / total_mem * 100 + percentage = peak_mem / total_mem * 100 if total_mem > 0 else 0 total_mem_gb = total_mem / 1024 / 1024 / 1024 ckp_url = 'https://pytorch.org/docs/stable/checkpoint.html' amp_url = 'https://pytorch.org/docs/stable/amp.html' diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/diffrun/operator.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/diffrun/operator.py index 4f6afdb7ec..4434c65ad6 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/diffrun/operator.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/diffrun/operator.py @@ -111,8 +111,8 @@ class Operators(Operator): ops: List[OperatorNode] = [] kernels: List[DeviceNode] = [] for n in nodes: - o, k = n.get_operator_and_kernels() - ops.extend(o) + op, k = n.get_operator_and_kernels() + ops.extend(op) kernels.extend(k) return ops, kernels diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/diffrun/tree.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/diffrun/tree.py index 412c677ce0..a164bd3d37 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/diffrun/tree.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/diffrun/tree.py @@ -20,9 +20,8 @@ class DiffNode: self.children: List[DiffNode] = [] def build_tree(self): - '''build the children from the left_node and right_node''' + """build the children from the left_node and right_node""" if not isinstance(self.left, Operators) or not isinstance(self.right, Operators): - # TODO: do we need calculate the stats or not? return if isinstance(self.left.op_nodes, OperatorNode) and isinstance(self.right.op_nodes, OperatorNode): @@ -39,7 +38,6 @@ class DiffNode: else: # one single item and one list pass - # TODO: do we need statistic the stats for both operator and kernel here? @staticmethod def create_node( @@ -84,16 +82,15 @@ class DiffNode: l_iter = 0 r_iter = 0 - for (l, r) in matched_paris: - left_child = left_nodes[l_iter:l] + for (left, r) in matched_paris: + left_child = left_nodes[l_iter:left] right_child = right_nodes[r_iter:r] if left_child or right_child: yield DiffNode.create_node(left_child, right_child) - yield DiffNode.create_node(left_nodes[l], right_nodes[r]) - l_iter = l + 1 + yield DiffNode.create_node(left_nodes[left], right_nodes[r]) + l_iter = left + 1 r_iter = r + 1 - # TODO: fill unknown nodes in case of the start_time of next node and current # end time is bigger than threshold. # Or do we need move the logic into frondend for visualization? diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/event_parser.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/event_parser.py index 213d800259..d79d8ebc3c 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/event_parser.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/event_parser.py @@ -387,7 +387,7 @@ class StepParser: self.steps[i_step] = (step_start_time, step_end_time) # Update step time considering device side. prev_step_end_time = step_end_time - is_remove_tail_steps = True # TODO: Use tensorboard argument instead. + is_remove_tail_steps = True if is_use_gpu and len(self.steps) > 1 and is_remove_tail_steps: i_step = len(self.steps) - 1 while i_step >= 0: diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/gpu_metrics_parser.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/gpu_metrics_parser.py index 74e7b54dfc..1321d5f6df 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/gpu_metrics_parser.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/gpu_metrics_parser.py @@ -303,7 +303,7 @@ class GPUMetricsParser(object): process_gpu(gpu_ids[idx]) tooltip_summary = 'The GPU usage metrics:\n' - tooltip = '{}\n{}'.format(tooltip_summary, consts.TOOLTIP_GPU_UTIL) + tooltip = '{}\n{}'.format(tooltip_summary, consts.TOOLTIP_GPU_UTIL) if has_sm_efficiency: tooltip += '\n' + consts.TOOLTIP_SM_EFFICIENCY if has_occupancy: diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/module_op.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/module_op.py index 68e74d5781..8c10cee675 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/module_op.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/module_op.py @@ -40,11 +40,11 @@ class ModuleStats: @property def avg_host_duration(self): - return self.host_duration / self.occurences + return self.host_duration / self.occurences if self.occurences != 0 else 0 @property def avg_device_duration(self): - return self.device_duration / self.occurences + return self.device_duration / self.occurences if self.occurences != 0 else 0 Stats = namedtuple('Stats', [ @@ -111,7 +111,7 @@ def _build_module_hierarchy(events: List[PythonFunctionEvent]) -> List[Module]: children.setdefault(e_id, []) e_parent_id = e.python_parent_id children.setdefault(e_parent_id, []) - children[e_parent_id].append(e_id) + children.get(e_parent_id).append(e_id) function_leaves = [k for k, v in children.items() if not v] # Convert Python function topology to Module topology. @@ -142,15 +142,15 @@ def _build_module_hierarchy(events: List[PythonFunctionEvent]) -> List[Module]: for child_id, parent_id in module_parent_map.items(): module_child_map.setdefault(child_id, []) module_child_map.setdefault(parent_id, []) - module_child_map[parent_id].append(child_id) + module_child_map.get(parent_id).append(child_id) # The traverse order is well defined which guarantees that a given topology # will produce a unique and unambiguous hierarchy. def append_hierarchy(e_id) -> Module: e = id_to_event[e_id] module = Module(e.name, e.module_id) - for id in module_child_map[e_id]: - child = append_hierarchy(id) + for idx in module_child_map.get(e_id): + child = append_hierarchy(idx) module.children.append(child) return module @@ -211,7 +211,7 @@ def _process_module_statistics( def process_modules(h_modules: Iterable[Module]): for m in h_modules: name = m.name.replace('nn.Module: ', '') - stats = module_aggs[(m.name, m.module_id)] + stats = module_aggs.get((m.name, m.module_id)) child_stats = list(process_modules(m.children)) yield Stats( diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/node.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/node.py index 54dc5d093b..824b809497 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/node.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/node.py @@ -68,7 +68,7 @@ class CommunicationNode(BaseNode): class HostNode(BaseNode): def __init__(self, device_duration: int = 0, **kwargs): super().__init__(**kwargs) - self.device_duration = device_duration # Total time of Kernel, GPU Memcpy, GPU Memset. TODO: parallel multi-stream? # noqa: E501 + self.device_duration = device_duration # Total time of Kernel, GPU Memcpy, GPU Memset. class OperatorNode(HostNode): @@ -90,7 +90,6 @@ class OperatorNode(HostNode): self.tc_total_duration = 0 # Time of TC kernels launched by this op including its children operators. def fill_stats(self): - # TODO: Replace recursive by using a stack, in case of too deep callstack. self.children.sort(key=lambda x: (x.start_time, -x.end_time)) self.runtimes.sort(key=lambda x: (x.start_time, -x.end_time) if x.start_time and x.end_time else (sys.maxsize, -sys.maxsize - 1)) diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/op_agg.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/op_agg.py index 8a1af502f5..f1fc6117be 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/op_agg.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/op_agg.py @@ -25,7 +25,6 @@ class OperatorAgg: self.tc_eligible = op.tc_eligible self.tc_self_duration: int = 0 self.tc_total_duration: int = 0 - # TODO: Think about adding these avgs to UI. @property def tc_self_ratio(self) -> float: @@ -81,7 +80,7 @@ class KernelAggByNameOp: @property def avg_duration(self): - return self.total_duration / self.calls + return self.total_duration / self.calls if self.calls > 0 else 0 @property def avg_blocks_per_sm(self) -> float: diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/op_tree.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/op_tree.py index bee6687e8b..5639c666aa 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/op_tree.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/op_tree.py @@ -50,7 +50,7 @@ class OpTreeBuilder: backward_modules: List[BackwardNode] = [] for module in modules: OpTreeBuilder._build_backward_module(module, None, fwd_bwd_root, backward_modules) - OpTreeBuilder._insert_backward_modules(self.tid2tree[self.main_tid], backward_modules) + OpTreeBuilder._insert_backward_modules(self.tid2tree.get(self.main_tid), backward_modules) self.tid2tree = {tid: root for tid, root in self.tid2tree.items() if len(root.children) > 0} return self.tid2tree @@ -104,7 +104,6 @@ class OpTreeBuilder: if staled_device_nodes: # Note: Although kernels of this dummy runtime is put under main thread's tree, # we don't know which thread launches them. - # TODO: Don't make belonging thread assumption on future usage if we need special handling dummpy_rt.append(RuntimeNode( name='dummy', start_time=None, @@ -143,7 +142,6 @@ class OpTreeBuilder: # Merge the consecutive calls to same function into one. # Just follow the same pattern in torch/autograd/profiler.py, # EventList._remove_dup_nodes - # TODO: Replace recursive by for loop, in case of too deep callstack. def remove_dup_nodes(node: OperatorNode): if node.type == EventTypes.RUNTIME: return @@ -259,6 +257,7 @@ class OpTreeBuilder: return fwd_to_bwdroot + @staticmethod def _build_backward_module(node: ModuleNode, parent: Optional[BackwardNode], fwd_bwd_map: Dict[int, List[OperatorNode]], diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/overall_parser.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/overall_parser.py index df1f29927e..261e70b7a1 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/overall_parser.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/overall_parser.py @@ -43,12 +43,12 @@ class OverallParser(object): slots: List[Tuple[int, int]] = [] for role in role_ranges: if slots: - range = intersection_ranges_lists(slots, role) + inter_range = intersection_ranges_lists(slots, role) else: - range = role + inter_range = role slots = merge_ranges(list(steps)) - cost_ranges.append(range) - slots = subtract_ranges_lists(slots, range) + cost_ranges.append(inter_range) + slots = subtract_ranges_lists(slots, inter_range) # The last one is ProfileRole.Other cost_ranges.append(slots) diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/range_utils.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/range_utils.py index c927d5acbe..1c46bd1ae8 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/range_utils.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/range_utils.py @@ -155,10 +155,10 @@ def intersection_ranges_lists(range_list1: List[Tuple[int, int]], def get_ranges_sum(ranges: List[Tuple[int, int]]) -> int: - sum: int = 0 - for range in ranges: - sum += (range[1] - range[0]) - return sum + total: int = 0 + for item in ranges: + total += (item[1] - item[0]) + return total def pop_list(range_list, index): diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/run_generator.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/run_generator.py index f5c92479d5..c7cc94ecd3 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/run_generator.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/run_generator.py @@ -144,7 +144,7 @@ class RunGenerator(object): return overlap_by_steps title = [x.lower() for x in data[0]] title_name = RunGenerator._check_overlap_data(title) - if title_name is None: + if not title_name: logger.error("Incomplete content of CSV file.") return overlap_by_steps @@ -165,7 +165,7 @@ class RunGenerator(object): # csv: step / compute time / communication_not_overlap / overlap / communication / free time length = len(title) if length < 5: - return + return [] key = ["computing", "overlapped", "communication(not overlapped)", "free"] get_key = list() for j in key: @@ -173,7 +173,7 @@ class RunGenerator(object): if j == title[i]: get_key.append(i) if len(get_key) < 4: - return None + return [] return get_key def _npu_get_wait_table(self): @@ -514,8 +514,9 @@ class RunGenerator(object): {'name': f'APP Reserved ({cano.memory_metric})', 'type': 'number', 'tooltip': 'APP reserved memory by allocator, both used and unused.'}] if len(component_curve_result['columns'][device]) > 0: - component_curve_result['columns'][device].insert(0, {'name': f'Time ({cano.time_metric})', 'type': 'number', - 'tooltip': 'Time since profiler starts.'}) + component_curve_result['columns'][device].insert(0, {'name': f'Time ({cano.time_metric})', + 'type': 'number', + 'tooltip': 'Time since profiler starts.'}) device_types = list(set(process_devices_type + pta_ge_devices_type)) return { 'devices': device_types, @@ -604,15 +605,24 @@ class RunGenerator(object): round(float(ls[reserved_idx]), 3)] pta_or_ge_data.setdefault(device_type, {}).setdefault(ls[tag_type_idx], []).append(line_chart_data) else: - self._handle_peak_memory_rows(device_type_idx, ls, peak_memory_rows, reserved_idx, tag_type_idx, - time_idx) + memory_curve_id_dict = { + 'device_type_idx': device_type_idx, + 'reserved_idx': reserved_idx, + 'tag_type_idx': tag_type_idx, + 'time_idx': time_idx + } + self._handle_peak_memory_rows(memory_curve_id_dict, ls, peak_memory_rows) peak_memory_events['rows'] = peak_memory_rows return process_data, pta_or_ge_data, peak_memory_events - def _handle_peak_memory_rows(self, device_type_idx, ls, peak_memory_rows, reserved_idx, tag_type_idx, time_idx): + def _handle_peak_memory_rows(self, memory_curve_id_dict, ls, peak_memory_rows): # Record the peak memory usage of other components. has_flag = False + device_type_idx = memory_curve_id_dict.get('device_type_idx') + reserved_idx = memory_curve_id_dict.get('reserved_idx') + tag_type_idx = memory_curve_id_dict.get('tag_type_idx') + time_idx = memory_curve_id_dict.get('time_idx') time_column = round((float(ls[time_idx]) - self.profile_data.start_ts) / 1000, 2) for item in peak_memory_rows[ls[device_type_idx]]: if item[0] == ls[tag_type_idx]: @@ -1016,7 +1026,7 @@ class RunGenerator(object): @staticmethod def _get_csv_data(path: str): if path is None: - return + return [] datas = [] with open(path, encoding='utf-8-sig') as f: for row in csv.reader(f, skipinitialspace=True): @@ -1146,7 +1156,7 @@ class DistributedRunGenerator(object): steps_to_overlap['all'][data.worker] = [0, 0, 0, 0] step_number = len(data.steps_names) if step_number <= 0: - return + return None if self.device_target != 'Ascend': DistributedRunGenerator._get_gpu_overlap_data(data, steps_to_overlap) else: @@ -1270,11 +1280,11 @@ class DistributedRunGenerator(object): op, stats[0], stats[1] * 1024 * 1024, - round(stats[1] * 1024 * 1024 / stats[0]), # 1MB = 1024 * 1024 bytes + round(stats[1] * 1024 * 1024 / stats[0] if stats != 0 else 0), # 1MB = 1024 * 1024 bytes stats[2] * 1000, - round(stats[2] * 1000 / stats[0]), # 1ms = 1000us + round(stats[2] * 1000 / stats[0] if stats != 0 else 0), # 1ms = 1000us stats[3] * 1000, - round(stats[3] * 1000 / stats[0]) # 1ms = 1000us + round(stats[3] * 1000 / stats[0] if stats != 0 else 0) # 1ms = 1000us ] table['rows'].append(row) @@ -1298,10 +1308,10 @@ class DistributedRunGenerator(object): op, stats[0], stats[1], - round(stats[1] / stats[0]), + round(stats[1] / stats[0] if stats != 0 else 0), stats[2], - round(stats[2] / stats[0]), + round(stats[2] / stats[0] if stats != 0 else 0), stats[3], - round(stats[3] / stats[0]) + round(stats[3] / stats[0] if stats != 0 else 0) ] table['rows'].append(row) diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/trace.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/trace.py index 5f0da88055..f44a7b5080 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/trace.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/profiler/trace.py @@ -158,10 +158,8 @@ class PLModuleEvent(DurationEvent): super().__init__(EventTypes.PL_MODULE, data) self.module_id = 0 # just to be compatible with ModuleEvent processing self.name = self.name.replace('[pl][module]', '') - # self.shape = self.name[:self.name.rfind(']')+1] - # self.name = self.name[self.name.rfind(']')+1:] self.module_type = self.name[:self.name.find(': ')] - self.name = self.name[self.name.find(': ')+2:] + self.name = self.name[self.name.find(': ') + 2:] def create_event(event, is_pytorch_lightning) -> Optional[BaseEvent]: diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/run.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/run.py index 870bf1909b..bd97d248ad 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/run.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/run.py @@ -192,7 +192,7 @@ class RunProfile(object): def get_memory_stats(self, start_ts=None, end_ts=None, memory_metric='K'): cano = Canonicalizer(memory_metric=memory_metric) - round = DisplayRounder(ndigits=2) + rounder = DisplayRounder(ndigits=2) stats = self.memory_snapshot.get_memory_statistics(self.tid2tree, start_ts=start_ts, end_ts=end_ts) @@ -232,12 +232,12 @@ class RunProfile(object): these_rows.append([ op_name, stat[6], - round(cano.convert_memory(stat[MemoryMetrics.IncreaseSize])), - round(cano.convert_memory(stat[MemoryMetrics.SelfIncreaseSize])), + rounder(cano.convert_memory(stat[MemoryMetrics.IncreaseSize])), + rounder(cano.convert_memory(stat[MemoryMetrics.SelfIncreaseSize])), stat[MemoryMetrics.AllocationCount], stat[MemoryMetrics.SelfAllocationCount], - round(cano.convert_memory(stat[MemoryMetrics.AllocationSize])), - round(cano.convert_memory(stat[MemoryMetrics.SelfAllocationSize])), + rounder(cano.convert_memory(stat[MemoryMetrics.AllocationSize])), + rounder(cano.convert_memory(stat[MemoryMetrics.SelfAllocationSize])), ]) for dev_name in sorted(stats.keys()): @@ -366,7 +366,7 @@ class RunProfile(object): return name cano = Canonicalizer(time_metric=time_metric, memory_metric=memory_metric) - round = DisplayRounder(ndigits=2) + rounder = DisplayRounder(ndigits=2) profiler_start_ts = self.profiler_start_ts memory_records = RunProfile._filtered_by_ts(self.memory_snapshot.memory_records, start_ts, end_ts) @@ -394,10 +394,10 @@ class RunProfile(object): free_ts = r.ts events[alloc_r.device_name].append([ get_op_name_or_ctx(alloc_r), - round(cano.convert_memory(-size)), - round(cano.convert_time(alloc_ts - profiler_start_ts)), - round(cano.convert_time(free_ts - profiler_start_ts)), - round(cano.convert_time(free_ts - alloc_ts)), + rounder(cano.convert_memory(-size)), + rounder(cano.convert_time(alloc_ts - profiler_start_ts)), + rounder(cano.convert_time(free_ts - profiler_start_ts)), + rounder(cano.convert_time(free_ts - alloc_ts)), ]) del alloc[addr] else: @@ -409,8 +409,8 @@ class RunProfile(object): r = memory_records[i] events[r.device_name].append([ get_op_name_or_ctx(r), - round(cano.convert_memory(r.bytes)), - round(cano.convert_time(r.ts - profiler_start_ts)), + rounder(cano.convert_memory(r.bytes)), + rounder(cano.convert_time(r.ts - profiler_start_ts)), None, None, ]) @@ -419,9 +419,9 @@ class RunProfile(object): r = memory_records[i] events[r.device_name].append([ get_op_name_or_ctx(r), - round(cano.convert_memory(-r.bytes)), + rounder(cano.convert_memory(-r.bytes)), None, - round(cano.convert_time(r.ts - profiler_start_ts)), + rounder(cano.convert_time(r.ts - profiler_start_ts)), None, ]) diff --git a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/utils.py b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/utils.py index 9bd488e2bf..4a02fa75c6 100644 --- a/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/utils.py +++ b/plugins/tensorboard-plugins/tb_plugin/torch_tb_profiler/utils.py @@ -94,11 +94,11 @@ class Canonicalizer: self.canonical_time_metrics = { 'micro': 'us', 'microsecond': 'us', 'us': 'us', 'milli': 'ms', 'millisecond': 'ms', 'ms': 'ms', - '': 's', 'second': 's', 's': 's', + '': 's', 'second': 's', 's': 's', } # canonicalize the memory metric to a string self.canonical_memory_metrics = { - '': 'B', 'B': 'B', + '': 'B', 'B': 'B', 'K': 'KB', 'KB': 'KB', 'M': 'MB', 'MB': 'MB', 'G': 'GB', 'GB': 'GB', -- Gitee