From 7bbc94507abb85d9e38313ab1af0307fe19ca756 Mon Sep 17 00:00:00 2001
From: wuyulong11 <wuyulong11@huawei.com>
Date: Tue, 18 Apr 2023 15:27:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E3=80=91=20=E9=80=82=E9=85=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90csv=E6=96=87=E4=BB=B6=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA?=
 =?UTF-8?q?=E3=80=91=20wuyulong=2030031080?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profiler/run_generator.py                 | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/tb_plugins/profiling/tb_plugin/torch_tb_profiler/profiler/run_generator.py b/tb_plugins/profiling/tb_plugin/torch_tb_profiler/profiler/run_generator.py
index d2504d62fd1..afb4006dcad 100644
--- a/tb_plugins/profiling/tb_plugin/torch_tb_profiler/profiler/run_generator.py
+++ b/tb_plugins/profiling/tb_plugin/torch_tb_profiler/profiler/run_generator.py
@@ -351,22 +351,9 @@ class RunGenerator(object):
         return datas
 
     def _generate_kernel_table(self):
-        display_columns = {
-            'Step ID': 'Step ID',
-            'Op Name': 'Name',
-            'Op Type': 'Type',
-            'Task Type': 'Accelerator Core',
-            'Task Start Time': 'Start Time',
-            'Task Duration(us)': 'Duration(us)',
-            'Task Wait Time(us)': 'Wait Time(us)',
-            'Block Dim': 'Block Dim',
-            'Input Shapes': 'Input Shapes',
-            'Input Data Types': 'Input Data Types',
-            'Input Formats': 'Input Formats',
-            'Output Shapes': 'Output Shapes',
-            'Output Data Types': 'Output Data Types',
-            'Output Formats': 'Output Formats'
-        }
+        display_columns = ('Step ID', 'Name', 'Type', 'Accelerator Core', 'Start Time', 'Duration(us)', 'Wait Time(us)',
+                           'Block Dim', 'Input Shapes', 'Input Data Types', 'Input Formats', 'Output Shapes',
+                           'Output Data Types', 'Output Formats')
         display_idxs = []
         table = {'columns': [], 'rows': []}
         result = {
@@ -385,9 +372,9 @@ class RunGenerator(object):
             elif column == 'Task Type':
                 self.core_type_idx = idx
 
-            if display_columns.get(column) is not None:
+            if column in display_columns:
                 display_idxs.append(idx)
-                table['columns'].append({'type': 'string', 'name': display_columns[column]})
+                table['columns'].append({'type': 'string', 'name': column})
         table['rows'] = [self._handle_kernel_table_rows(display_idxs, ls) for idx, ls in
                          enumerate(datas) if idx != 0]
         return result
-- 
Gitee


From b1282ad5e8c142c5671771c06c77523a9f0a4dc0 Mon Sep 17 00:00:00 2001
From: wuyulong11 <wuyulong11@huawei.com>
Date: Tue, 18 Apr 2023 16:22:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E3=80=91=20=E9=80=82=E9=85=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90csv=E6=96=87=E4=BB=B6=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E3=80=90=E4=BF=AE=E6=94=B9=E4=BA=BA?=
 =?UTF-8?q?=E3=80=91=20wuyulong=2030031080?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../torch_tb_profiler/profiler/run_generator.py        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tb_plugins/profiling/tb_plugin/torch_tb_profiler/profiler/run_generator.py b/tb_plugins/profiling/tb_plugin/torch_tb_profiler/profiler/run_generator.py
index afb4006dcad..d28ebf8b476 100644
--- a/tb_plugins/profiling/tb_plugin/torch_tb_profiler/profiler/run_generator.py
+++ b/tb_plugins/profiling/tb_plugin/torch_tb_profiler/profiler/run_generator.py
@@ -344,8 +344,8 @@ class RunGenerator(object):
             reader = csv.DictReader(f)
             for row in reader:
                 data = []
-                data.append(row.get('Op Name'))
-                data.append(float(row.get('Task Duration(us)')))
+                data.append(row.get('Name'))
+                data.append(float(row.get('Duration(us)')))
                 pie['rows'].append(data)
         datas = {'total': pie}
         return datas
@@ -365,11 +365,11 @@ class RunGenerator(object):
         path = self.profile_data.kernel_file_path
         datas = self._get_csv_data(path)
         for idx, column in enumerate(datas[0]):
-            if column == 'Op Name':
+            if column == 'Name':
                 self.name_idx = idx
-            elif column == 'Task Duration(us)':
+            elif column == 'Duration(us)':
                 self.duration_idx = idx
-            elif column == 'Task Type':
+            elif column == 'Type':
                 self.core_type_idx = idx
 
             if column in display_columns:
-- 
Gitee