Skip to content

Commit a2fb0ae

Browse files
committed
fix agg
1 parent 480a8a3 commit a2fb0ae

File tree

4 files changed

+119
-91
lines changed

4 files changed

+119
-91
lines changed
-11.5 KB
Binary file not shown.

_unittests/ut_helpers/test_log_helper.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ def df1(cls):
2222
textwrap.dedent(
2323
"""
2424
date,version_python,version_transformers,model_name,model_exporter,time_load,time_latency,time_baseline,disc_ort,disc_ort2
25-
2025/01/01,3.13.3,4.52.4,phi3,export,0.5,0.1,0.1,1e-5,1e-5
26-
2025/01/02,3.13.3,4.52.4,phi3,export,0.6,0.11,0.1,1e-5,1e-5
27-
2025/01/01,3.13.3,4.52.4,phi4,export,0.5,0.1,0.105,1e-5,1e-5
28-
2025/01/01,3.12.3,4.52.4,phi4,onnx-dynamo,0.5,0.1,0.999,1e-5,1e-5
25+
2025/01/01,3.13.3,4.52.4,phi3,export,0.51,0.1,0.1,1e-5,1e-5
26+
2025/01/02,3.13.3,4.52.4,phi3,export,0.62,0.11,0.11,1e-5,1e-5
27+
2025/01/01,3.13.3,4.52.4,phi4,export,0.53,0.1,0.105,1e-5,1e-5
28+
2025/01/01,3.12.3,4.52.4,phi4,onnx-dynamo,0.54,0.14,0.999,1e-5,1e-5
2929
"""
3030
)
3131
)
@@ -99,7 +99,11 @@ def test_cube_logs_view_repr(self):
9999
def test_cube_logs_view(self):
100100
cube = self.cube1(verbose=1)
101101
view = cube.view(
102-
CubeViewDef(["version.*", "model_name"], ["time_latency", "time_baseline"])
102+
CubeViewDef(
103+
["version.*", "model_name"],
104+
["time_latency", "time_baseline"],
105+
ignore_columns=["date"],
106+
)
103107
)
104108
self.assertEqual((3, 4), view.shape)
105109
self.assertEqual(
@@ -117,7 +121,10 @@ def test_cube_logs_view(self):
117121

118122
view = cube.view(
119123
CubeViewDef(
120-
["version.*"], ["time_latency", "time_baseline"], order=["model_exporter"]
124+
["version.*"],
125+
["time_latency", "time_baseline"],
126+
order=["model_exporter"],
127+
ignore_columns=["date"],
121128
)
122129
)
123130
self.assertEqual((2, 6), view.shape)
@@ -140,12 +147,13 @@ def test_cube_logs_view_agg(self):
140147
CubeViewDef(
141148
["version.*", "model.*"],
142149
["time_latency", "time_baseline"],
143-
key_agg=["model_name"],
150+
key_agg=["model_name", "date"],
151+
ignore_columns=["version_python"],
144152
)
145153
)
146154
self.assertEqual((2, 2), view.shape)
147155
self.assertEqual(["time_baseline", "time_latency"], list(view.columns))
148-
self.assertEqual([("3.13.3", "export"), ("3.12.3", "onnx-dynamo")], list(view.index))
156+
self.assertEqual([("export",), ("onnx-dynamo",)], list(view.index))
149157

150158
@hide_stdout()
151159
def test_cube_logs_excel(self):
@@ -205,7 +213,7 @@ def test_cube_logs_performance(self):
205213
"time",
206214
"time_export",
207215
"err",
208-
"cmd",
216+
# "cmd",
209217
"bucket-speedup",
210218
"raw-short",
211219
],

onnx_diagnostic/_command_lines_parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ def _cmd_agg(argv: List[Any]):
686686

687687
csv = list(
688688
enumerate_csv_files(
689-
args.inputs, verbose=args.verbose, filtering=lambda name: reg.search(name)
689+
args.inputs, verbose=args.verbose, filtering=lambda name: bool(reg.search(name))
690690
)
691691
)
692692
assert csv, f"No csv files in {args.inputs}"

0 commit comments

Comments
 (0)