From 656e73d366616111f43497049f30376b5b1200aa Mon Sep 17 00:00:00 2001 From: coleramos425 Date: Tue, 7 Feb 2023 14:45:22 -0600 Subject: [PATCH] Upgrade python formatting module Signed-off-by: coleramos425 [ROCm/rocprofiler-compute commit: 48df0d6db4aceb4850d4c5e352612fb05fa64ad0] --- projects/rocprofiler-compute/src/docs/conf.py | 1 + .../src/omniperf_analyze/convertor/sql/convertor.py | 1 - .../src/omniperf_analyze/convertor/sql/convertor2.py | 1 - .../src/omniperf_analyze/utils/file_io.py | 1 - .../rocprofiler-compute/src/omniperf_analyze/utils/gui.py | 4 ++-- .../src/omniperf_analyze/utils/gui_components/header.py | 1 + .../src/omniperf_analyze/utils/parser.py | 3 --- .../src/omniperf_analyze/utils/roofline_calc.py | 3 +-- .../src/omniperf_analyze/utils/schema.py | 1 - .../rocprofiler-compute/src/omniperf_analyze/utils/tty.py | 2 -- projects/rocprofiler-compute/src/parser.py | 1 - projects/rocprofiler-compute/src/utils/csv_converter.py | 2 -- .../rocprofiler-compute/src/utils/gfx_perfmon_builder.py | 8 -------- projects/rocprofiler-compute/src/utils/perfagg.py | 5 ----- projects/rocprofiler-compute/src/utils/remove_workload.py | 1 + projects/rocprofiler-compute/src/utils/specs.py | 3 --- 16 files changed, 6 insertions(+), 32 deletions(-) diff --git a/projects/rocprofiler-compute/src/docs/conf.py b/projects/rocprofiler-compute/src/docs/conf.py index 2b5d2e62d0..48d4c5596f 100644 --- a/projects/rocprofiler-compute/src/docs/conf.py +++ b/projects/rocprofiler-compute/src/docs/conf.py @@ -141,6 +141,7 @@ for pref in preferences: from recommonmark.transform import AutoStructify + # app setup hook def setup(app): app.add_config_value( diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/convertor/sql/convertor.py b/projects/rocprofiler-compute/src/omniperf_analyze/convertor/sql/convertor.py index fefab1b615..dba816948a 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/convertor/sql/convertor.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/convertor/sql/convertor.py @@ -26,7 +26,6 @@ import re import sys if __name__ == "__main__": - with open(sys.argv[1], "r") as file: s = file.read() diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/convertor/sql/convertor2.py b/projects/rocprofiler-compute/src/omniperf_analyze/convertor/sql/convertor2.py index 5247dcde16..df4e2e5135 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/convertor/sql/convertor2.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/convertor/sql/convertor2.py @@ -26,7 +26,6 @@ import re import sys if __name__ == "__main__": - with open(sys.argv[1], "r") as file: s = file.read() diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/file_io.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/file_io.py index 9b57bbf7d4..04539feb44 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/file_io.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/file_io.py @@ -217,7 +217,6 @@ def collect_wave_occu_per_cu(in_dir, out_dir, numSE): for i in range(numSE): p = Path(in_dir, "wave_occu_se" + str(i) + ".csv") if p.exists(): - tmp_df = pd.read_csv(p) SE_idx = "SE" + str(tmp_df.loc[0, "SE"]) tmp_df.rename( diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui.py index da7c16b07c..98bc38ebcc 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui.py @@ -59,6 +59,7 @@ barchart_elements = { "l2_cache_per_chan": [1801, 1802], } + ################## # HELPER FUNCTIONS ################## @@ -83,7 +84,6 @@ def multi_bar_chart(table_id, display_df): def discrete_background_color_bins(df, n_bins=5, columns="all"): - bounds = [i * (1.0 / n_bins) for i in range(n_bins + 1)] if columns == "all": if "id" in df: @@ -191,7 +191,7 @@ def build_bar_chart(display_df, table_config, norm_filt): elif table_config["id"] in barchart_elements["l2_cache_per_chan"]: nested_bar = {} channels = [] - for (colName, colData) in display_df.items(): + for colName, colData in display_df.items(): if colName == "Channel": channels = list(colData.values) else: diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui_components/header.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui_components/header.py index accae9fa3c..ddf665d799 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui_components/header.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui_components/header.py @@ -27,6 +27,7 @@ from omniperf_analyze.utils import schema avail_normalizations = ["per_wave", "per_cycle", "per_second", "per_kernel"] + # List all the unique column values for desired column in df, 'target_col' def list_unique(orig_list, is_numeric): list_set = set(orig_list) diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/parser.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/parser.py index ec925cef1a..f4f91f4f5a 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/parser.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/parser.py @@ -346,7 +346,6 @@ def build_dfs(archConfigs, filter_metrics): i = 0 for key, entries in data_cofig["metric"].items(): - data_source_idx = ( str(data_cofig["id"] // 100) + "." @@ -365,7 +364,6 @@ def build_dfs(archConfigs, filter_metrics): # the whole IP block in filter (str(panel_id // 100) in filter_metrics) ): - values.append(metric_idx) values.append(key) for k, v in entries.items(): @@ -401,7 +399,6 @@ def build_dfs(archConfigs, filter_metrics): or (data_source_idx == "0") # no filter or (data_source_idx in filter_metrics) ): - if ( "columnwise" in data_cofig and data_cofig["columnwise"] == True diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/roofline_calc.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/roofline_calc.py index 158a2cb28b..7a324c3efd 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/roofline_calc.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/roofline_calc.py @@ -42,6 +42,7 @@ FONT_WEIGHT = "bold" SUPPORTED_SOC = ["mi200"] + ################################################ # Helper funcs ################################################ @@ -181,7 +182,6 @@ def plot_roof(roof_details, roof_data, mem_level, verbose): # ------------------------------------------------------------------------------------- # Calculate relevent metrics for ai calculation def plot_application(sortType, ret_df, verbose): - df = ret_df["pmc_perf"] # Sort by top kernels or top dispatches? df = df.sort_values(by=["KernelName"]) @@ -472,7 +472,6 @@ def plot_application(sortType, ret_df, verbose): def empirical_roof(roof_info, mem_level, verbose): - roofPath = roof_info["path"] + "/roofline.csv" # ----------------------------------------------------- # Initialize roofline data dictionary from roofline.csv diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/schema.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/schema.py index 87394da339..3d77eee0ac 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/schema.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/schema.py @@ -33,7 +33,6 @@ from collections import OrderedDict @dataclass class ArchConfig: - # [id: panel_config] pairs panel_configs: OrderedDict = field(default=dict) diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/tty.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/tty.py index 9f6ed2e400..1afe8e08e8 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/tty.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/tty.py @@ -74,11 +74,9 @@ def show_all(runs, archConfigs, output, decimal, time_unit, selected_cols, verbo ) or (type == "raw_csv_table") ): - if header in hidden_columns: pass elif header not in comparable_columns: - if ( type == "raw_csv_table" and table_config["source"] == "pmc_kernel_top.csv" diff --git a/projects/rocprofiler-compute/src/parser.py b/projects/rocprofiler-compute/src/parser.py index 4a77e390b1..a48a84906e 100644 --- a/projects/rocprofiler-compute/src/parser.py +++ b/projects/rocprofiler-compute/src/parser.py @@ -33,7 +33,6 @@ from common import getVersion, getVersionDisplay def parse(my_parser): - # versioning info vData = getVersion() versionString = getVersionDisplay(vData["version"], vData["sha"], vData["mode"]) diff --git a/projects/rocprofiler-compute/src/utils/csv_converter.py b/projects/rocprofiler-compute/src/utils/csv_converter.py index 50faa5787e..b1e536c12f 100644 --- a/projects/rocprofiler-compute/src/utils/csv_converter.py +++ b/projects/rocprofiler-compute/src/utils/csv_converter.py @@ -37,7 +37,6 @@ MAX_SERVER_SEL_DELAY = 5000 # 5 sec connection timeout def kernel_name_shortener(df, cache, level): - if level >= 5: return df @@ -50,7 +49,6 @@ def kernel_name_shortener(df, cache, level): if columnName == "KernelName" or columnName == "Name": # loop through all indices for index in df.index: - original_name = df.loc[index, columnName] if original_name in cache: continue diff --git a/projects/rocprofiler-compute/src/utils/gfx_perfmon_builder.py b/projects/rocprofiler-compute/src/utils/gfx_perfmon_builder.py index 68bcebe7a3..566449c3d5 100755 --- a/projects/rocprofiler-compute/src/utils/gfx_perfmon_builder.py +++ b/projects/rocprofiler-compute/src/utils/gfx_perfmon_builder.py @@ -163,7 +163,6 @@ class mainWindow(QMainWindow): self.exportPMCCounters(fileName) def exportPMCCounters(self, fileName): - f = open(fileName, "w") total_IP_blocks = len(list(self.perfmon_config.keys())) @@ -188,7 +187,6 @@ class mainWindow(QMainWindow): return def pmc_metric_selected(self, metric_name, col): - # check if the metric already exists metric_selected = False @@ -314,7 +312,6 @@ class mainWindow(QMainWindow): self.table.setItem(row, col, QTableWidgetItem(metric_name)) def pmc_select(self, item): - metric_name = item.data() if ( not metric_name in self.nodes_dict @@ -334,13 +331,11 @@ class mainWindow(QMainWindow): # Function to save populate treeview with a dictionary def importData(self, xmlparsed, root=None): - self.model.setRowCount(0) if root is None: root = self.model.invisibleRootItem() for x in xmlparsed.getiterator(): - # Add SoC node to Root if x.tag in self.soc_arch_list: parent = root @@ -349,10 +344,8 @@ class mainWindow(QMainWindow): # check all metrics in an SoC family if x.tag == "metric" and x.getparent().tag in self.soc_arch_list: - # New IP block (e.g., SQ), detected, create a new hierarchy for the block if not x.attrib["block"] in self.block_list: - self.block_list.append(x.attrib["block"]) parent = self.nodes_dict[x.getparent().tag] # the SoC node parent.appendRow( @@ -386,7 +379,6 @@ class mainWindow(QMainWindow): if __name__ == "__main__": - app = QApplication(sys.argv) app.setStyle("Fusion") diff --git a/projects/rocprofiler-compute/src/utils/perfagg.py b/projects/rocprofiler-compute/src/utils/perfagg.py index 07cd4a59bf..f40f242699 100755 --- a/projects/rocprofiler-compute/src/utils/perfagg.py +++ b/projects/rocprofiler-compute/src/utils/perfagg.py @@ -85,7 +85,6 @@ perfmon_config = { def perfmon_coalesce(pmc_files_list, workload_dir, soc): - workload_perfmon_dir = workload_dir + "/perfmon" # match pattern for pmc counters @@ -110,7 +109,6 @@ def perfmon_coalesce(pmc_files_list, workload_dir, soc): # Extract all PMC counters and store in separate buckets for fname in pmc_files_list: - lines = open(fname, "r").read().splitlines() for line in lines: @@ -183,7 +181,6 @@ def perfmon_coalesce(pmc_files_list, workload_dir, soc): def perfmon_emit(pmc_list, workload_dir, soc): - workload_perfmon_dir = workload_dir + "/perfmon" # Calculate the minimum number of iteration to save the pmc counters @@ -246,7 +243,6 @@ def perfmon_emit(pmc_list, workload_dir, soc): def perfmon_filter(workload_dir, perfmon_dir, args): - workload_perfmon_dir = workload_dir + "/perfmon" soc = args.target @@ -288,7 +284,6 @@ def perfmon_filter(workload_dir, perfmon_dir, args): def pmc_filter(workload_dir, perfmon_dir, soc): - workload_perfmon_dir = workload_dir + "/perfmon" if not os.path.isdir(workload_perfmon_dir): diff --git a/projects/rocprofiler-compute/src/utils/remove_workload.py b/projects/rocprofiler-compute/src/utils/remove_workload.py index 3d21186a0a..11cb5df256 100755 --- a/projects/rocprofiler-compute/src/utils/remove_workload.py +++ b/projects/rocprofiler-compute/src/utils/remove_workload.py @@ -26,6 +26,7 @@ import argparse import getpass from pymongo import MongoClient + # Verify target directory and setup connection def remove_workload(args): # parser = argparse.ArgumentParser(description='Remove a workload from an Omniperf Instance') diff --git a/projects/rocprofiler-compute/src/utils/specs.py b/projects/rocprofiler-compute/src/utils/specs.py index 5e567ad895..4c95194406 100644 --- a/projects/rocprofiler-compute/src/utils/specs.py +++ b/projects/rocprofiler-compute/src/utils/specs.py @@ -84,7 +84,6 @@ class MachineSpecs: def gpuinfo(): - rocminfo = run(["rocminfo"]).split("\n") for idx1, linetext in enumerate(rocminfo): @@ -97,7 +96,6 @@ def gpuinfo(): L1, L2 = "", "" for idx2, linetext in enumerate(rocminfo[idx1 + 1 :]): - key = search(r"^\s*L1:\s+ ([a-zA-Z0-9]+)\s*", linetext) if key != None: L1 = key @@ -159,7 +157,6 @@ def search(pattern, string): def get_machine_specs(devicenum): - cpuinfo = path("/proc/cpuinfo").read_text() meminfo = path("/proc/meminfo").read_text() version = path("/proc/version").read_text()