add key columns

data_config.json

@@ -4,11 +4,12 @@
     "模型": []
 
   },
-  "distinguish": ["模型", "卡类型", "卡数"],
+  "distinguish": ["模型", "卡数"],
   "group_by": [["并发数"], ["输入长度(tokens)", "输出长度(tokens)"]],
+  "colkey": ["卡类型", "vLLM版本", "V0/V1 Engine"],
   "files": [
     {
-      "file": "test100.xlsx",
+      "file": "t.xlsx",
       "sheets": [],
       "column_mapping": {
       },

plot_comparison.py

@@ -70,9 +70,11 @@ def apply_filter(df, filter_dict):
                 df = df[df[filter_col] == filter_values]
     return df
 
-def generate_chart(df_subset, output_path, compare_col, outer_group_cols, inner_group_cols, metric_cols, merge_groups=False):
+def generate_chart(df_subset, output_path, colkey, outer_group_cols, inner_group_cols, metric_cols, merge_groups=False):
     df_subset = df_subset.copy()
-    df_subset[compare_col] = df_subset['vLLM版本'].astype(str) + '_' + df_subset['V0/V1 Engine'].astype(str)
+    compare_col = "ColKey"
+    df_subset[compare_col] = df_subset[colkey].apply(lambda x: '_'.join(x.dropna().astype(str)), axis=1)
+    #df_subset[compare_col] = df_subset['vLLM版本'].astype(str) + '_' + df_subset['V0/V1 Engine'].astype(str)
     
     all_group_cols = outer_group_cols + inner_group_cols
     if all_group_cols:
@@ -288,6 +290,9 @@ if isinstance(group_by[0], list):
 else:
     outer_group = []
     inner_group = group_by
+colkey = config.get('colkey', [])
+if len(colkey) == 0:
+    print(f"column key error")
 
 dist_combinations = df_renamed.groupby(dist_cols).size().reset_index()
 print(f"\n将生成 {len(dist_combinations)} 个图表...")
@@ -309,7 +314,12 @@ for idx, (_, dist_row) in enumerate(dist_combinations.iterrows()):
     output_path = os.path.join(args.输出目录, output_filename)
     
     print(f"[{idx+1}/{len(dist_combinations)}] 生成图表: {output_filename}")
-    success = generate_chart(df_subset, output_path, 'vLLM_Engine', outer_group, inner_group, metric_cols, args.合并分组)
+    for c in metric_cols:
+        try:
+            df_subset[c] = df_subset[c].astype('float64')
+        except Exception as e:
+            print(f"数据转换错误, 列名{c}, 错误信息{e}")
+    success = generate_chart(df_subset, output_path, colkey, outer_group, inner_group, metric_cols, args.合并分组)
     
     if success:
         chart_count += 1