fix aggregation

Author: xadupre

onnx_diagnostic/helpers/log_helper.py

@@ -1577,7 +1577,9 @@ def _process_formula(
 
         def gdf(df, cname, default_value=np.nan):
             if cname in df.columns:
-                return df[cname]
+                if np.isnan(default_value):
+                    return df[cname]
+                return df[cname].fillna(default_value)
             return pandas.Series(default_value, index=df.index)
 
         def ghas_value(df, cname):
@@ -1686,14 +1688,14 @@ def first_err(df: pandas.DataFrame) -> pandas.Series:
                     gdf(df, "time_latency_eager") > gdf(df, "time_latency", np.inf) * 3.98,
                 ),
                 n_node_attention23=lambda df: gpreserve(
-                    df, "op_onnx__Attention", gdf(df, "op_onnx__Attention")
+                    df, "time_latency_eager", gdf(df, "op_onnx__Attention")
                 ),
                 n_node_rotary_embedding23=lambda df: gpreserve(
-                    df, "op_onnx__RotaryEmbedding", gdf(df, "op_onnx__RotaryEmbedding")
+                    df, "time_latency_eager", gdf(df, "op_onnx__RotaryEmbedding")
                 ),
                 n_node_layer_normalization23=lambda df: gpreserve(
                     df,
-                    "time_latency",
+                    "time_latency_eager",
                     gdf(df, "op_onnx__LayerNormalization", 0)
                     + gdf(df, "op_onnx__RMSNormalization", 0)
                     + gdf(df, "op_onnx__BatchNormlization", 0)
@@ -1702,7 +1704,7 @@ def first_err(df: pandas.DataFrame) -> pandas.Series:
                 ),
                 n_node_attention=lambda df: gpreserve(
                     df,
-                    "time_latency",
+                    "time_latency_eager",
                     gdf(df, "op_onnx_com.microsoft_Attention", 0)
                     + gdf(df, "op_onnx_com.microsoft_MultiHeadAttention", 0)
                     + gdf(df, "op_onnx_com.microsoft_PackedAttention", 0)
@@ -1717,7 +1719,7 @@ def first_err(df: pandas.DataFrame) -> pandas.Series:
                 ),
                 n_node_layer_normalization=lambda df: gpreserve(
                     df,
-                    "time_latency",
+                    "time_latency_eager",
                     gdf(df, "op_onnx_com.microsoft_EmbedLayerNormalization", 0)
                     + gdf(df, "op_onnx_com.microsoft_SkipLayerNormalization", 0)
                     + gdf(df, "op_onnx_com.microsoft_LayerNormalization", 0)
@@ -1726,13 +1728,13 @@ def first_err(df: pandas.DataFrame) -> pandas.Series:
                 ),
                 n_node_rotary_embedding=lambda df: gpreserve(
                     df,
-                    "time_latency",
+                    "time_latency_eager",
                     gdf(df, "op_onnx_com.microsoft_GemmaRotaryEmbedding", 0)
                     + gdf(df, "op_onnx_com.microsoft_RotaryEmbedding", 0),
                 ),
                 n_node_control_flow=lambda df: gpreserve(
                     df,
-                    "op_onnx__If",
+                    "time_latency_eager",
                     (
                         gdf(df, "op_onnx__If", 0)
                         + gdf(df, "op_onnx__Scan", 0)
@@ -1741,7 +1743,7 @@ def first_err(df: pandas.DataFrame) -> pandas.Series:
                 ),
                 n_node_scatter=lambda df: gpreserve(
                     df,
-                    "op_onnx__ScatterND",
+                    "time_latency_eager",
                     gdf(df, "op_onnx__ScatterND", 0) + gdf(df, "op_onnx__ScatterElements", 0),
                 ),
                 n_node_function=lambda df: gpreserve(
@@ -1754,13 +1756,13 @@ def first_err(df: pandas.DataFrame) -> pandas.Series:
                     df, "onnx_n_initializer", gdf(df, "onnx_n_initializer")
                 ),
                 n_node_constant=lambda df: gpreserve(
-                    df, "op_onnx__Constant", gdf(df, "op_onnx__Constant")
+                    df, "time_latency_eager", gdf(df, "op_onnx__Constant")
                 ),
                 n_node_shape=lambda df: gpreserve(
-                    df, "op_onnx__Shape", gdf(df, "op_onnx__Shape")
+                    df, "time_latency_eager", gdf(df, "op_onnx__Shape")
                 ),
                 n_node_expand=lambda df: gpreserve(
-                    df, "op_onnx__Expand", gdf(df, "op_onnx__Expand")
+                    df, "time_latency_eager", gdf(df, "op_onnx__Expand")
                 ),
             )
             assert (