fix agg

Author: xadupre

_unittests/ut_helpers/test_log_helper.py

@@ -151,9 +151,17 @@ def test_cube_logs_view_agg(self):
                 ignore_columns=["version_python"],
             )
         )
-        self.assertEqual((2, 2), view.shape)
-        self.assertEqual(["time_baseline", "time_latency"], list(view.columns))
-        self.assertEqual([("export",), ("onnx-dynamo",)], list(view.index))
+        self.assertEqual((4, 1), view.shape)
+        self.assertEqual(["VALUE"], list(view.columns))
+        self.assertEqual(
+            [
+                ("export", "time_baseline"),
+                ("export", "time_latency"),
+                ("onnx-dynamo", "time_baseline"),
+                ("onnx-dynamo", "time_latency"),
+            ],
+            list(view.index),
+        )
 
     @hide_stdout()
     def test_cube_logs_excel(self):
@@ -210,6 +218,7 @@ def test_cube_logs_performance(self):
                 "agg-suite",
                 "disc",
                 "speedup",
+                "counts",
                 "time",
                 "time_export",
                 "err",

onnx_diagnostic/_command_lines_parser.py

@@ -647,15 +647,16 @@ def get_parser_agg() -> ArgumentParser:
     parser.add_argument(
         "-k",
         "--keys",
-        default="^version_.*,^model_.*,device,opt_patterns,suite,memory_peak,machine,exporter,dynamic,rtopt,dtype,device,architecture",
+        default="^version_.*,^model_.*,device,opt_patterns,suite,memory_peak,"
+        "machine,exporter,dynamic,rtopt,dtype,device,architecture",
         help="List of columns to consider as keys, "
         "multiple values are separated by `,`\n"
         "regular expressions are allowed",
     )
     parser.add_argument(
         "-w",
         "--values",
-        default="^time_.*,^disc.*,^ERR_.*,CMD,^ITER.*",
+        default="^time_.*,^disc.*,^ERR_.*,CMD,^ITER.*,^onnx_.*,^op_onnx_.*",
         help="List of columns to consider as values, "
         "multiple values are separated by `,`\n"
         "regular expressions are allowed",
@@ -666,12 +667,18 @@ def get_parser_agg() -> ArgumentParser:
     parser.add_argument(
         "-f",
         "--formula",
-        default="speedup,bucket[speedup],ERR1",
+        default="speedup,bucket[speedup],ERR1,n_models,n_eager,"
+        "n_running,n_acc01,n_acc001,n_dynamic,n_pass,n_faster,"
+        "n_faster2x,n_faster3x,n_faster4x,n_attention,"
+        "peak_gpu_torch,peak_gpu_nvidia,n_control_flow,"
+        "n_constant,n_shape,n_expand,"
+        "n_function,n_initializer,n_scatter,time_export_unbiased",
         help="Columns to compute after the aggregation was done.",
     )
     parser.add_argument(
         "--views",
-        default="agg-suite,disc,speedup,time,time_export,err,cmd,bucket-speedup,raw-short",
+        default="agg-suite,disc,speedup,time,time_export,err,cmd,"
+        "bucket-speedup,raw-short,counts",
         help="Views to add to the output files.",
     )
     parser.add_argument(