Skip to content

Commit 00a4b70

Browse files
committed
fix agg
1 parent a4eabf4 commit 00a4b70

File tree

3 files changed

+181
-77
lines changed

3 files changed

+181
-77
lines changed

CHANGELOGS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Change Logs
44
0.7.1
55
+++++
66

7-
* :pr:`151`: adds command line ``agg``, class CubeLogsPerformance to produce timeseries
7+
* :pr:`151`, :pr:`153`: adds command line ``agg``, class CubeLogsPerformance to produce timeseries
88
* :pr:`152`: add a function to compute fully dynamic shapes given any inputs
99

1010
0.7.0

onnx_diagnostic/_command_lines_parser.py

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -662,17 +662,19 @@ def get_parser_agg() -> ArgumentParser:
662662
"regular expressions are allowed",
663663
)
664664
parser.add_argument(
665-
"-i", "--ignored", default="version_python", help="List of columns to ignore"
665+
"-i", "--ignored", default="^version_.*", help="List of columns to ignore"
666666
)
667667
parser.add_argument(
668668
"-f",
669669
"--formula",
670-
default="speedup,bucket[speedup],ERR1,n_models,n_eager,"
671-
"n_running,n_acc01,n_acc001,n_dynamic,n_pass,n_faster,"
672-
"n_faster2x,n_faster3x,n_faster4x,n_attention,"
673-
"peak_gpu_torch,peak_gpu_nvidia,n_control_flow,"
674-
"n_constant,n_shape,n_expand,"
675-
"n_function,n_initializer,n_scatter,time_export_unbiased",
670+
default="speedup,bucket[speedup],ERR1,n_models,n_model_eager,"
671+
"n_model_running,n_model_acc01,n_model_acc001,n_model_dynamic,"
672+
"n_model_pass,n_model_faster,"
673+
"n_model_faster2x,n_model_faster3x,n_model_faster4x,n_node_attention,"
674+
"peak_gpu_torch,peak_gpu_nvidia,n_node_control_flow,"
675+
"n_node_constant,n_node_shape,n_node_expand,"
676+
"n_node_function,n_node_initializer,n_node_scatter,"
677+
"time_export_unbiased",
676678
help="Columns to compute after the aggregation was done.",
677679
)
678680
parser.add_argument(
@@ -702,7 +704,7 @@ def _cmd_agg(argv: List[Any]):
702704
args.inputs, verbose=args.verbose, filtering=lambda name: bool(reg.search(name))
703705
)
704706
)
705-
assert csv, f"No csv files in {args.inputs}"
707+
assert csv, f"No csv files in {args.inputs}, csv={csv}"
706708
if args.verbose:
707709
from tqdm import tqdm
708710

@@ -712,7 +714,9 @@ def _cmd_agg(argv: List[Any]):
712714
dfs = []
713715
for c in loop:
714716
df = open_dataframe(c)
715-
assert args.time in df.columns, f"Missing time column {args.time!r} in {c.head()!r}"
717+
assert (
718+
args.time in df.columns
719+
), f"Missing time column {args.time!r} in {c!r}\n{df.head()}\n{sorted(df.columns)}"
716720
dfs.append(df)
717721

718722
cube = CubeLogsPerformance(

0 commit comments

Comments
 (0)