diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/omniperf_analyze.py b/projects/rocprofiler-compute/src/omniperf_analyze/omniperf_analyze.py index 72ed4adbd4..1d9c18028e 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/omniperf_analyze.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/omniperf_analyze.py @@ -92,7 +92,7 @@ def initialize_run(args, normalization_filter=None): if not normalization_filter: for k, v in archConfigs.items(): parser.build_metric_value_string(v.dfs, v.dfs_type, args.normal_unit) - else: + else: for k, v in archConfigs.items(): parser.build_metric_value_string(v.dfs, v.dfs_type, normalization_filter) @@ -121,9 +121,9 @@ def initialize_run(args, normalization_filter=None): w.dfs_type = archConfigs[arch].dfs_type w.soc_spec = file_io.get_soc_params(soc_spec_df, arch) runs[d[0]] = w - + # Return rather than referencing 'runs' globally (since used outside of file scope) - return runs + return runs def run_gui(args, runs): @@ -151,7 +151,7 @@ def run_gui(args, runs): "kernel": runs[args.path[0][0]].filter_kernel_ids, "gpu": runs[args.path[0][0]].filter_gpu_ids, "dispatch": runs[args.path[0][0]].filter_dispatch_ids, - "normalization": args.normal_unit + "normalization": args.normal_unit, } gui.build_layout( @@ -171,8 +171,10 @@ def run_gui(args, runs): else: print("Multiple runs not supported yet") + def run_cli(args, runs): from omniperf_analyze.utils import tty + # NB: # If we assume the panel layout for all archs are similar, it doesn't matter # which archConfig passed into show_all function. diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui.py index 0fdfa06275..b96bcea8a2 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/gui.py @@ -322,9 +322,7 @@ def build_layout( children=[ dbc.Spinner( children=[ - get_header( - base_data.raw_pmc, input_filters, filt_kernel_names - ), + get_header(base_data.raw_pmc, input_filters, filt_kernel_names), html.Div(id="container", children=[]), ], fullscreen=True, @@ -342,11 +340,13 @@ def build_layout( [Input("norm-filt", "value")], [State("container", "children")], ) - def generate_from_filter(disp_filt, kernel_filter, gcd_filter, norm_filt, div_children): + def generate_from_filter( + disp_filt, kernel_filter, gcd_filter, norm_filt, div_children + ): if verbose <= 1: print("normalization is ", norm_filt) - - base_data = initialize_run(args, norm_filt) # Re-initalize everything + + base_data = initialize_run(args, norm_filt) # Re-initalize everything panel_configs = copy.deepcopy(archConfigs.panel_configs) # Generate original raw df base_data[base_run].raw_pmc = file_io.create_df_pmc(path_to_dir) diff --git a/projects/rocprofiler-compute/src/omniperf_analyze/utils/parser.py b/projects/rocprofiler-compute/src/omniperf_analyze/utils/parser.py index ce238c622d..ec925cef1a 100644 --- a/projects/rocprofiler-compute/src/omniperf_analyze/utils/parser.py +++ b/projects/rocprofiler-compute/src/omniperf_analyze/utils/parser.py @@ -68,7 +68,7 @@ supported_denom = { "per_wave": "SQ_WAVES", "per_cycle": "GRBM_GUI_ACTIVE", "per_second": "((EndNs - BeginNs) / 1000000000)", - "per_kernel": "1" + "per_kernel": "1", } # Build-in defined in mongodb variables: