mirror of
https://github.com/vllm-project/vllm.git
synced 2025-10-20 14:53:52 +08:00
Signed-off-by: Nick Hill <nhill@redhat.com> Signed-off-by: Lucas Kabela <lucaskabela@meta.com> Signed-off-by: Max de Bayser <mbayser@br.ibm.com> Signed-off-by: Andrew Sansom <andrew@protopia.ai> Signed-off-by: Boyuan Feng <boyuan@meta.com> Signed-off-by: Boyuan Feng <fby.1994@gmail.com> Signed-off-by: boyuanfeng <boyuan@meta.com> Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Signed-off-by: JartX <sagformas@epdcenter.es> Signed-off-by: Chendi Xue <Chendi.Xue@intel.com> Signed-off-by: chaunceyjiang <chaunceyjiang@gmail.com> Signed-off-by: DarkLight1337 <tlleungac@connect.ust.hk> Signed-off-by: Chen Zhang <zhangch99@outlook.com> Signed-off-by: Roger Wang <hey@rogerw.io> Signed-off-by: mgoin <mgoin64@gmail.com> Signed-off-by: wwl2755 <wangwenlong2755@gmail.com> Signed-off-by: Manoel Marques <manoel.marques@ibm.com> Signed-off-by: Manoel Marques <manoelmrqs@gmail.com> Signed-off-by: Isotr0py <mozf@mail2.sysu.edu.cn> Signed-off-by: pengdrumli <pengdrumli@tencent.com> Signed-off-by: windsonsea <haifeng.yao@daocloud.io> Signed-off-by: Woosuk Kwon <woosuk@thinkingmachines.ai> Signed-off-by: Woosuk Kwon <woosuk.kwon@berkeley.edu> Signed-off-by: Huamin Li <3ericli@gmail.com> Signed-off-by: simondanielsson <simon.danielsson99@hotmail.com> Signed-off-by: Rahul Tuli <rtuli@redhat.com> Signed-off-by: Yang <lymailforjob@gmail.com> Signed-off-by: Debolina Roy <debroy@redhat.com> Signed-off-by: David Chen <530634352@qq.com> Signed-off-by: wangzi <3220100013@zju.edu.cn> Signed-off-by: Eldar Kurtic <8884008+eldarkurtic@users.noreply.github.com> Signed-off-by: NickLucche <nlucches@redhat.com> Signed-off-by: Yizhou Liu <liu_yizhou@outlook.com> Signed-off-by: Sara Kokkila Schumacher <saraks@ibm.com> Signed-off-by: Csrayz <jover@cmbchina.com> Signed-off-by: ivyilike <pww123@cmbchina.com> Signed-off-by: Burkhard Ringlein <ngl@zurich.ibm.com> Signed-off-by: Bowen Wang <abmfy@icloud.com> Signed-off-by: qqma <qqma@amazon.com> Signed-off-by: ElizaWszola <ewszola@redhat.com> Signed-off-by: Lu Fang <fanglu@fb.com> Signed-off-by: Zhuohan Li <zhuohan123@gmail.com> Signed-off-by: Luka Govedič <lgovedic@redhat.com> Signed-off-by: luka <lgovedic@redhat.com> Signed-off-by: Luka Govedič <ProExpertProg@users.noreply.github.com> Signed-off-by: Or Ozeri <oro@il.ibm.com> Signed-off-by: Johnny Yang <johnnyyang@google.com> Signed-off-by: Alec Solder <alecs@fb.com> Signed-off-by: Alec S <10566873+alecsolder@users.noreply.github.com> Signed-off-by: Russell Bryant <rbryant@redhat.com> Signed-off-by: Matthew Bonanni <mbonanni@redhat.com> Signed-off-by: Alexander Matveev <amatveev@redhat.com> Signed-off-by: yewentao256 <zhyanwentao@126.com> Signed-off-by: liuye.hj <liuye.hj@alibaba-inc.com> Signed-off-by: Kunshang Ji <kunshang.ji@intel.com> Signed-off-by: Lucia Fang <116399278+luccafong@users.noreply.github.com> Signed-off-by: Michael Goin <mgoin64@gmail.com> Signed-off-by: Varun Sundar Rabindranath <vsundarr@redhat.com> Signed-off-by: Ming Yang <minos.future@gmail.com> Signed-off-by: Zhikaiiii <1658973216@qq.com> Signed-off-by: Andreas Hartel <andreas.hartel@aleph-alpha.com> Signed-off-by: Jee Jee Li <pandaleefree@gmail.com> Signed-off-by: vllmellm <vllm.ellm@embeddedllm.com> Signed-off-by: wuxibin <wuxibin@bytedance.com> Signed-off-by: youkaichao <youkaichao@gmail.com> Signed-off-by: Peter Pan <Peter.Pan@daocloud.io> Signed-off-by: Peter Pan <peter.pan@daocloud.io> Signed-off-by: Nicolò Lucchesi<nicolo.lucchesi@gmail.com> Signed-off-by: Thomas Parnell <tpa@zurich.ibm.com> Signed-off-by: Sage Moore <sage@neuralmagic.com> Signed-off-by: Lucas Wilkinson <lwilkins@redhat.com> Signed-off-by: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com> Signed-off-by: Tyler Michael Smith <tyler@neuralmagic.com> Signed-off-by: Bill Nell <bnell@redhat.com> Signed-off-by: Shreeasish Kumar <shreeasish@rivosinc.com> Signed-off-by: Weida Hong <wdhongtw@google.com> Signed-off-by: Ekagra Ranjan <3116519+ekagra-ranjan@users.noreply.github.com> Signed-off-by: Hashem Hashemi <hashem.hashemi@amd.com> Signed-off-by: Hashem Hashemi <159079214+amd-hhashemi@users.noreply.github.com> Signed-off-by: Amir Samani <asamani@nvidia.com> Signed-off-by: ElizaWszola <elizaw.9289@gmail.com> Signed-off-by: jiahanc <173873397+jiahanc@users.noreply.github.com> Signed-off-by: ilmarkov <markovilya197@gmail.com> Signed-off-by: Gregory Shtrasberg <Gregory.Shtrasberg@amd.com> Signed-off-by: Jialin Ouyang <Jialin.Ouyang@gmail.com> Signed-off-by: rouchenzi <ruochenwen@gmail.com> Signed-off-by: rouchenzi <40842833+rouchenzi@users.noreply.github.com> Signed-off-by: Andrew Xia <axia@meta.com> Signed-off-by: Kourosh Hakhamaneshi <kourosh@anyscale.com> Signed-off-by: Corey Lowman <clowman1993@gmail.com> Signed-off-by: jpvillam <jpvillam@amd.com> Signed-off-by: dougbtv <dosmith@redhat.com> Signed-off-by: Chenxi Yang <cxyang@fb.com> Signed-off-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com> Signed-off-by: ahao-anyscale <ahao@anyscale.com> Signed-off-by: Yan Lu <luyan@nvidia.com> Signed-off-by: baxingpiaochong <771405853@qq.com> Signed-off-by: Kyle Sayers <kylesayrs@gmail.com> Signed-off-by: Nikhil Gupta <nikhil.gupta2@arm.com> Signed-off-by: Yong Hoon Shin <yhshin@meta.com> Signed-off-by: Benjamin Chislett <benjamin.chislett@centml.ai> Signed-off-by: Benjamin Chislett <bchislett@nvidia.com> Signed-off-by: Ben Browning <bbrownin@redhat.com> Signed-off-by: Chengji Yao <chengjiyao@google.com> Signed-off-by: jiang1.li <jiang1.li@intel.com> Signed-off-by: Jackmin801 <ongjackm@gmail.com> Signed-off-by: Jonas M. Kübler <44084297+jmkuebler@users.noreply.github.com> Signed-off-by: taohui <taohui3@gmail.com> Signed-off-by: rongfu.leng <rongfu.leng@daocloud.io> Signed-off-by: Shu Wang <shuw@nvidia.com> Signed-off-by: Shu Wang. <shuw@nvidia.com> Signed-off-by: Tyler Michael Smith <tlrmchlsmth@gmail.com> Signed-off-by: Duncan Moss <djm.moss@gmail.com> Signed-off-by: Shiyan Deng <dsy842974287@meta.com> Signed-off-by: Wei Wei <wwei6@meta.com> Signed-off-by: Saman Keon <samanamp@outlook.com> Signed-off-by: yangxurui <yangxurui@meituan.com> Signed-off-by: nicole-lihui <nicole.li@daocloud.io> Signed-off-by: courage17340 <courage17340@163.com> Signed-off-by: Jacob Kahn <jacobkahn1@gmail.com> Signed-off-by: Fadi Arafeh <fadi.arafeh@arm.com> Signed-off-by: Agata Dobrzyniewicz <adobrzyniewicz@habana.ai> Signed-off-by: zxw <1020938856@qq.com> Signed-off-by: wang.yuqi <noooop@126.com> Signed-off-by: Cyrus Leung <cyrus.tl.leung@gmail.com> Signed-off-by: chenlang <chen.lang5@zte.com.cn> Signed-off-by: Jonas Kuebler <kuebj@amazon.com> Signed-off-by: AlonKejzman <alonkeizman@gmail.com> Signed-off-by: Tao Hui <taohui3@gmail.com> Signed-off-by: Matthew Bonanni <mbonanni001@gmail.com> Signed-off-by: Tomer Asida <57313761+tomeras91@users.noreply.github.com> Signed-off-by: Aleksandr Malyshev <maleksan@amd.com> Signed-off-by: Eugene Khvedchenia <ekhvedchenia@nvidia.com> Signed-off-by: Eugene Khvedchenya <ekhvedchenya@gmail.com> Signed-off-by: yiting.jiang <yiting.jiang@daocloud.io> Signed-off-by: xaguilar <Xavier.AguilarFruto@amd.com> Signed-off-by: Iceber Gu <caiwei95@hotmail.com> Signed-off-by: Tao He <linzhu.ht@alibaba-inc.com> Signed-off-by: Icey <1790571317@qq.com> Signed-off-by: 许文卿 <xwq391974@alibaba-inc.com> Signed-off-by: Chih-Chieh-Yang <7364402+cyang49@users.noreply.github.com> Co-authored-by: Nick Hill <nhill@redhat.com> Co-authored-by: Lucas Kabela <lucasakabela@gmail.com> Co-authored-by: Maximilien de Bayser <mbayser@br.ibm.com> Co-authored-by: Andrew Sansom <andrew@protopia.ai> Co-authored-by: Boyuan Feng <boyuan@meta.com> Co-authored-by: Luka Govedič <ProExpertProg@users.noreply.github.com> Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Harry Mellor <19981378+hmellor@users.noreply.github.com> Co-authored-by: JartX <sagformas@epdcenter.es> Co-authored-by: Chendi.Xue <chendi.xue@intel.com> Co-authored-by: Chauncey <chaunceyjiang@gmail.com> Co-authored-by: xin.li <xin.li@daocloud.io> Co-authored-by: Cyrus Leung <tlleungac@connect.ust.hk> Co-authored-by: Chen Zhang <zhangch99@outlook.com> Co-authored-by: Roger Wang <hey@rogerw.io> Co-authored-by: Michael Goin <mgoin64@gmail.com> Co-authored-by: Wenlong Wang <wangwenlong2755@gmail.com> Co-authored-by: Manoel Marques <manoelmrqs@gmail.com> Co-authored-by: Isotr0py <mozf@mail2.sysu.edu.cn> Co-authored-by: lirong <56789630+lirong-lirong@users.noreply.github.com> Co-authored-by: Michael Yao <haifeng.yao@daocloud.io> Co-authored-by: Woosuk Kwon <woosuk.kwon@berkeley.edu> Co-authored-by: Huamin Li <3ericli@gmail.com> Co-authored-by: Lu Fang <30275821+houseroad@users.noreply.github.com> Co-authored-by: Simon Danielsson <70206058+simondanielsson@users.noreply.github.com> Co-authored-by: Rahul Tuli <rtuli@redhat.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Yang Liu <127183760+KKSK-DON@users.noreply.github.com> Co-authored-by: Deboleina <debroy@redhat.com> Co-authored-by: yinz-aizip <yinz@aizip.ai> Co-authored-by: WeiQing Chen <40507679+david6666666@users.noreply.github.com> Co-authored-by: wangzi <3220100013@zju.edu.cn> Co-authored-by: Eldar Kurtić <8884008+eldarkurtic@users.noreply.github.com> Co-authored-by: Nicolò Lucchesi <nlucches@redhat.com> Co-authored-by: Ye (Charlotte) Qi <yeq@meta.com> Co-authored-by: Yizhou <136800916+yiz-liu@users.noreply.github.com> Co-authored-by: Sara-KS <50249410+Sara-KS@users.noreply.github.com> Co-authored-by: Csrayz <jover@cmbchina.com> Co-authored-by: ivyilike <pww123@cmbchina.com> Co-authored-by: Burkhard Ringlein <ngl@zurich.ibm.com> Co-authored-by: Bowen Wang <abmfy@icloud.com> Co-authored-by: Tyler Michael Smith <tyler@neuralmagic.com> Co-authored-by: Daisy-Ma-coder <daisy.ma.0117@gmail.com> Co-authored-by: qqma <qqma@amazon.com> Co-authored-by: ElizaWszola <ewszola@redhat.com> Co-authored-by: Lucia Fang <116399278+luccafong@users.noreply.github.com> Co-authored-by: Zhuohan Li <zhuohan123@gmail.com> Co-authored-by: Simon Mo <simon.mo@hey.com> Co-authored-by: Or Ozeri <oro@il.ibm.com> Co-authored-by: Johnny Yang <24908445+jcyang43@users.noreply.github.com> Co-authored-by: Chengji Yao <chengjiyao@google.com> Co-authored-by: Alec S <10566873+alecsolder@users.noreply.github.com> Co-authored-by: Alec Solder <alecs@fb.com> Co-authored-by: Russell Bryant <rbryant@redhat.com> Co-authored-by: Matthew Bonanni <mbonanni@redhat.com> Co-authored-by: Robert Shaw <114415538+robertgshaw2-redhat@users.noreply.github.com> Co-authored-by: Chris Bamford <chrisbam4d@gmail.com> Co-authored-by: Alexander Matveev <59768536+alexm-redhat@users.noreply.github.com> Co-authored-by: Wentao Ye <44945378+yewentao256@users.noreply.github.com> Co-authored-by: JJJYmmm <92386084+JJJYmmm@users.noreply.github.com> Co-authored-by: liuye.hj <liuye.hj@alibaba-inc.com> Co-authored-by: Kunshang Ji <kunshang.ji@intel.com> Co-authored-by: Lucia (Lu) Fang <fanglu@meta.com> Co-authored-by: Varun Sundar Rabindranath <varunsundar08@gmail.com> Co-authored-by: Varun Sundar Rabindranath <vsundarr@redhat.com> Co-authored-by: Ming Yang <yming@meta.com> Co-authored-by: Zhikaiiii <55917203+Zhikaiiii@users.noreply.github.com> Co-authored-by: Andreas Hartel <andreas@hartel.me> Co-authored-by: Jee Jee Li <pandaleefree@gmail.com> Co-authored-by: vllmellm <vllm.ellm@embeddedllm.com> Co-authored-by: Joel <wuxibin89@163.com> Co-authored-by: youkaichao <youkaichao@gmail.com> Co-authored-by: Mark McLoughlin <markmc@redhat.com> Co-authored-by: Peter Pan <peter.pan@daocloud.io> Co-authored-by: Nicolò Lucchesi <nicolo.lucchesi@gmail.com> Co-authored-by: Fanli Lin <fanli.lin@intel.com> Co-authored-by: Thomas Parnell <tpa@zurich.ibm.com> Co-authored-by: Lucas Wilkinson <LucasWilkinson@users.noreply.github.com> Co-authored-by: Sage Moore <sage@neuralmagic.com> Co-authored-by: yewentao256 <zhyanwentao@126.com> Co-authored-by: bnellnm <49004751+bnellnm@users.noreply.github.com> Co-authored-by: rivos-shreeasish <shreeasish@rivosinc.com> Co-authored-by: Chih-Chieh Yang <chih.chieh.yang@ibm.com> Co-authored-by: Weida Hong <wdhongtw@gmail.com> Co-authored-by: Ekagra Ranjan <3116519+ekagra-ranjan@users.noreply.github.com> Co-authored-by: Hashem Hashemi <159079214+amd-hhashemi@users.noreply.github.com> Co-authored-by: Amir Samani <samani@ualberta.ca> Co-authored-by: Luka Govedič <lgovedic@redhat.com> Co-authored-by: jiahanc <173873397+jiahanc@users.noreply.github.com> Co-authored-by: Ilya Markov <markovilya197@gmail.com> Co-authored-by: Gregory Shtrasberg <156009573+gshtras@users.noreply.github.com> Co-authored-by: Jialin Ouyang <Jialin.Ouyang@gmail.com> Co-authored-by: rouchenzi <40842833+rouchenzi@users.noreply.github.com> Co-authored-by: Andrew Xia <axia@meta.com> Co-authored-by: kourosh hakhamaneshi <31483498+kouroshHakha@users.noreply.github.com> Co-authored-by: Corey Lowman <clowman1993@gmail.com> Co-authored-by: Juan Villamizar <100237675+jpvillam-amd@users.noreply.github.com> Co-authored-by: jpvillam <jpvillam@amd.com> Co-authored-by: Doug Smith <dosmith@redhat.com> Co-authored-by: Chenxi Yang <cxyang@cs.utexas.edu> Co-authored-by: Chenxi Yang <cxyang@fb.com> Co-authored-by: ahao-anyscale <ahao@anyscale.com> Co-authored-by: 0xNullPath <luyanfcp@foxmail.com> Co-authored-by: baxingpiaochong <771405853@qq.com> Co-authored-by: Benjamin Chislett <bchislett@nvidia.com> Co-authored-by: Kyle Sayers <kylesayrs@gmail.com> Co-authored-by: Nikhil Gupta <nikhil.gupta2@arm.com> Co-authored-by: Yong Hoon Shin <48474650+sarckk@users.noreply.github.com> Co-authored-by: lhsjohn <huashuoli@tencent.com> Co-authored-by: Ben Browning <bbrownin@redhat.com> Co-authored-by: Li, Jiang <jiang1.li@intel.com> Co-authored-by: Jackmin801 <56836461+Jackmin801@users.noreply.github.com> Co-authored-by: Jonas M. Kübler <44084297+jmkuebler@users.noreply.github.com> Co-authored-by: Tao Hui <taohui3@gmail.com> Co-authored-by: rongfu.leng <rongfu.leng@daocloud.io> Co-authored-by: Shu Wang <shuw@nvidia.com> Co-authored-by: Tyler Michael Smith <tlrmchlsmth@gmail.com> Co-authored-by: Duncan Moss <djm.moss@gmail.com> Co-authored-by: Shiyan Deng <dsy842974287@meta.com> Co-authored-by: Wei Wei <wwei6@meta.com> Co-authored-by: Saman A. Pour <samanamp@outlook.com> Co-authored-by: XuruiYang <530534756@qq.com> Co-authored-by: yangxurui <yangxurui@meituan.com> Co-authored-by: Nicole LiHui 🥜 <nicolelihui@outlook.com> Co-authored-by: courage17340 <courage17340@users.noreply.github.com> Co-authored-by: Jacob Kahn <jacobkahn1@gmail.com> Co-authored-by: Nicole LiHui 🥜 <nicole.li@daocloud.io> Co-authored-by: Fadi Arafeh <115173828+fadara01@users.noreply.github.com> Co-authored-by: Agata Dobrzyniewicz <160237065+adobrzyn@users.noreply.github.com> Co-authored-by: yyzxw <34639446+yyzxw@users.noreply.github.com> Co-authored-by: wang.yuqi <noooop@126.com> Co-authored-by: Cyrus Leung <cyrus.tl.leung@gmail.com> Co-authored-by: chenlang <chen.lang5@zte.com.cn> Co-authored-by: chenlang <10346245@zte.com.cn> Co-authored-by: AlonKejzman <alonkeizman@gmail.com> Co-authored-by: tomeras91 <57313761+tomeras91@users.noreply.github.com> Co-authored-by: Aleksandr Malyshev <164964928+maleksan85@users.noreply.github.com> Co-authored-by: Aleksandr Malyshev <maleksan@amd.com> Co-authored-by: Doug Lehr <douglehr@amd.com> Co-authored-by: Eugene Khvedchenya <ekhvedchenya@gmail.com> Co-authored-by: yitingdc <59356937+yitingdc@users.noreply.github.com> Co-authored-by: xaguilar-amd <xavier.aguilarfruto@amd.com> Co-authored-by: Iceber Gu <caiwei95@hotmail.com> Co-authored-by: Tao He <linzhu.ht@alibaba-inc.com> Co-authored-by: Icey <1790571317@qq.com> Co-authored-by: Xu Wenqing <121550081+Xu-Wenqing@users.noreply.github.com> Co-authored-by: Chih-Chieh Yang <7364402+cyang49@users.noreply.github.com> Co-authored-by: RishiAstra <40644327+RishiAstra@users.noreply.github.com>
308 lines
11 KiB
Python
308 lines
11 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
|
import argparse
|
|
import json
|
|
import os
|
|
from importlib import util
|
|
|
|
import pandas as pd
|
|
|
|
plotly_found = util.find_spec("plotly.express") is not None
|
|
|
|
|
|
def compare_data_columns(
|
|
files, name_column, data_column, info_cols, drop_column, debug=False
|
|
):
|
|
"""
|
|
Align concatenation by keys derived from info_cols instead of row order.
|
|
- Pick one canonical key list: subset of info_cols present in ALL files.
|
|
- For each file: set index to those keys, aggregate duplicates
|
|
- (mean for metric, first for names).
|
|
- Concat along axis=1 (indexes align), then reset_index so callers can
|
|
- group by columns.
|
|
- If --debug, add a <file_label>_name column per file.
|
|
"""
|
|
print("\ncompare_data_column:", data_column)
|
|
|
|
frames = []
|
|
raw_data_cols = []
|
|
compare_frames = []
|
|
|
|
# 1) choose a canonical key list from info_cols that exists in ALL files
|
|
cols_per_file = []
|
|
for f in files:
|
|
try:
|
|
df_tmp = pd.read_json(f, orient="records")
|
|
except Exception as err:
|
|
raise ValueError(f"Failed to read {f}") from err
|
|
cols_per_file.append(set(df_tmp.columns))
|
|
|
|
key_cols = [c for c in info_cols if all(c in cset for cset in cols_per_file)]
|
|
if not key_cols:
|
|
# soft fallback: use any info_cols present in the first file
|
|
key_cols = [c for c in info_cols if c in list(cols_per_file[0])]
|
|
if not key_cols:
|
|
raise ValueError(
|
|
"No common key columns found from info_cols across the input files."
|
|
)
|
|
|
|
# 2) build a single "meta" block (keys as columns) once, aligned by the key index
|
|
meta_added = False
|
|
|
|
for file in files:
|
|
df = pd.read_json(file, orient="records")
|
|
|
|
# Keep rows that actually have the compared metric (same as original behavior)
|
|
if drop_column in df.columns:
|
|
df = df.dropna(subset=[drop_column], ignore_index=True)
|
|
|
|
# Stabilize numeric key columns (harmless if missing)
|
|
for c in (
|
|
"Input Len",
|
|
"Output Len",
|
|
"TP Size",
|
|
"PP Size",
|
|
"# of max concurrency.",
|
|
"qps",
|
|
):
|
|
if c in df.columns:
|
|
df[c] = pd.to_numeric(df[c], errors="coerce")
|
|
|
|
# Ensure all key columns exist
|
|
for c in key_cols:
|
|
if c not in df.columns:
|
|
df[c] = pd.NA
|
|
|
|
# Set index = key_cols and aggregate duplicates → unique MultiIndex
|
|
df_idx = df.set_index(key_cols, drop=False)
|
|
|
|
# meta (key columns), unique per key
|
|
meta = df_idx[key_cols]
|
|
if not meta.index.is_unique:
|
|
meta = meta.groupby(level=key_cols, dropna=False).first()
|
|
|
|
# metric series for this file, aggregated to one row per key
|
|
file_label = "/".join(file.split("/")[:-1]) or os.path.basename(file)
|
|
s = df_idx[data_column]
|
|
if not s.index.is_unique:
|
|
s = s.groupby(level=key_cols, dropna=False).mean()
|
|
s.name = file_label # column label like original
|
|
|
|
# add meta once (from first file) so keys are the leftmost columns
|
|
if not meta_added:
|
|
frames.append(meta)
|
|
meta_added = True
|
|
|
|
# (NEW) debug: aligned test-name column per file
|
|
if debug and name_column in df_idx.columns:
|
|
name_s = df_idx[name_column]
|
|
if not name_s.index.is_unique:
|
|
name_s = name_s.groupby(level=key_cols, dropna=False).first()
|
|
name_s.name = f"{file_label}_name"
|
|
frames.append(name_s)
|
|
|
|
frames.append(s)
|
|
raw_data_cols.append(file_label)
|
|
compare_frames.append(s)
|
|
|
|
# Generalize ratio: for any file N>=2, add ratio (fileN / file1)
|
|
if len(compare_frames) >= 2:
|
|
base = compare_frames[0]
|
|
current = compare_frames[-1]
|
|
ratio = current / base
|
|
ratio = ratio.mask(base == 0) # avoid inf when baseline is 0
|
|
ratio.name = f"Ratio 1 vs {len(compare_frames)}"
|
|
frames.append(ratio)
|
|
|
|
# 4) concat on columns with aligned MultiIndex;
|
|
# then reset_index to return keys as columns
|
|
concat_df = pd.concat(frames, axis=1)
|
|
concat_df = concat_df.reset_index(drop=True).reset_index()
|
|
if "index" in concat_df.columns:
|
|
concat_df = concat_df.drop(columns=["index"])
|
|
|
|
# Ensure key/info columns appear first (in your info_cols order)
|
|
front = [c for c in info_cols if c in concat_df.columns]
|
|
rest = [c for c in concat_df.columns if c not in front]
|
|
concat_df = concat_df[front + rest]
|
|
|
|
print(raw_data_cols)
|
|
return concat_df, raw_data_cols
|
|
|
|
|
|
def split_json_by_tp_pp(
|
|
input_file: str = "benchmark_results.json", output_root: str = "."
|
|
) -> list[str]:
|
|
"""
|
|
Split a benchmark JSON into separate folders by (TP Size, PP Size).
|
|
|
|
Creates: <output_root>/tp{TP}_pp{PP}/benchmark_results.json
|
|
Returns: list of file paths written.
|
|
"""
|
|
# Load JSON data into DataFrame
|
|
with open(input_file, encoding="utf-8") as f:
|
|
data = json.load(f)
|
|
|
|
# If the JSON is a dict with a list under common keys, use that list
|
|
if isinstance(data, dict):
|
|
for key in ("results", "serving_results", "benchmarks", "data"):
|
|
if isinstance(data.get(key), list):
|
|
data = data[key]
|
|
break
|
|
|
|
df = pd.DataFrame(data)
|
|
|
|
# Keep only "serving" tests
|
|
name_col = next(
|
|
(c for c in ["Test name", "test_name", "Test Name"] if c in df.columns), None
|
|
)
|
|
if name_col:
|
|
df = df[
|
|
df[name_col].astype(str).str.contains(r"serving", case=False, na=False)
|
|
].copy()
|
|
|
|
# Handle alias column names
|
|
rename_map = {
|
|
"tp_size": "TP Size",
|
|
"tensor_parallel_size": "TP Size",
|
|
"pp_size": "PP Size",
|
|
"pipeline_parallel_size": "PP Size",
|
|
}
|
|
df.rename(
|
|
columns={k: v for k, v in rename_map.items() if k in df.columns}, inplace=True
|
|
)
|
|
|
|
# Ensure TP/PP columns exist (default to 1 if missing)
|
|
if "TP Size" not in df.columns:
|
|
df["TP Size"] = 1
|
|
if "PP Size" not in df.columns:
|
|
df["PP Size"] = 1
|
|
|
|
# make sure TP/PP are numeric ints with no NaN
|
|
df["TP Size"] = (
|
|
pd.to_numeric(df.get("TP Size", 1), errors="coerce").fillna(1).astype(int)
|
|
)
|
|
df["PP Size"] = (
|
|
pd.to_numeric(df.get("PP Size", 1), errors="coerce").fillna(1).astype(int)
|
|
)
|
|
|
|
# Split into separate folders
|
|
saved_paths: list[str] = []
|
|
for (tp, pp), group_df in df.groupby(["TP Size", "PP Size"], dropna=False):
|
|
folder_name = os.path.join(output_root, f"tp{int(tp)}_pp{int(pp)}")
|
|
os.makedirs(folder_name, exist_ok=True)
|
|
filepath = os.path.join(folder_name, "benchmark_results.json")
|
|
group_df.to_json(filepath, orient="records", indent=2, force_ascii=False)
|
|
print(f"Saved: {filepath}")
|
|
saved_paths.append(filepath)
|
|
|
|
return saved_paths
|
|
|
|
|
|
if __name__ == "__main__":
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument(
|
|
"-f", "--file", action="append", type=str, help="input file name"
|
|
)
|
|
parser.add_argument(
|
|
"--debug", action="store_true", help="show all information for debugging"
|
|
)
|
|
parser.add_argument(
|
|
"--plot",
|
|
action=argparse.BooleanOptionalAction,
|
|
default=True,
|
|
help="plot perf diagrams or not --no-plot --plot",
|
|
)
|
|
parser.add_argument(
|
|
"-x",
|
|
"--xaxis",
|
|
type=str,
|
|
default="# of max concurrency.",
|
|
help="column name to use as X Axis in comparison graph",
|
|
)
|
|
args = parser.parse_args()
|
|
|
|
drop_column = "P99"
|
|
name_column = "Test name"
|
|
info_cols = [
|
|
"Model",
|
|
"Dataset Name",
|
|
"Input Len",
|
|
"Output Len",
|
|
"TP Size",
|
|
"PP Size",
|
|
"# of max concurrency.",
|
|
"qps",
|
|
]
|
|
data_cols_to_compare = ["Output Tput (tok/s)", "Median TTFT (ms)", "Median"]
|
|
html_msgs_for_data_cols = [
|
|
"Compare Output Tokens /n",
|
|
"Median TTFT /n",
|
|
"Median TPOT /n",
|
|
]
|
|
|
|
if len(args.file) == 1:
|
|
files = split_json_by_tp_pp(args.file[0], output_root="splits")
|
|
info_cols = [c for c in info_cols if c not in ("TP Size", "PP Size")]
|
|
else:
|
|
files = args.file
|
|
print("comparing : " + ", ".join(files))
|
|
debug = args.debug
|
|
plot = args.plot
|
|
# For Plot feature, assign y axis from one of info_cols
|
|
y_axis_index = info_cols.index(args.xaxis) if args.xaxis in info_cols else 6
|
|
with open("perf_comparison.html", "w") as text_file:
|
|
for i in range(len(data_cols_to_compare)):
|
|
output_df, raw_data_cols = compare_data_columns(
|
|
files,
|
|
name_column,
|
|
data_cols_to_compare[i],
|
|
info_cols,
|
|
drop_column,
|
|
debug=debug,
|
|
)
|
|
|
|
# For Plot feature, insert y axis from one of info_cols
|
|
raw_data_cols.insert(0, info_cols[y_axis_index])
|
|
|
|
filtered_info_cols = info_cols[:-2]
|
|
existing_group_cols = [
|
|
c for c in filtered_info_cols if c in output_df.columns
|
|
]
|
|
if not existing_group_cols:
|
|
raise ValueError(
|
|
f"No valid group-by columns "
|
|
f"Expected subset: {filtered_info_cols}, "
|
|
f"but DataFrame has: {list(output_df.columns)}"
|
|
)
|
|
output_df_sorted = output_df.sort_values(by=existing_group_cols)
|
|
output_groups = output_df_sorted.groupby(existing_group_cols, dropna=False)
|
|
for name, group in output_groups:
|
|
html = group.to_html()
|
|
text_file.write(html_msgs_for_data_cols[i])
|
|
text_file.write(html)
|
|
|
|
if plot and plotly_found:
|
|
import plotly.express as px
|
|
|
|
df = group[raw_data_cols]
|
|
df_sorted = df.sort_values(by=info_cols[y_axis_index])
|
|
# Melt DataFrame for plotting
|
|
df_melted = df_sorted.melt(
|
|
id_vars=info_cols[y_axis_index],
|
|
var_name="Configuration",
|
|
value_name=data_cols_to_compare[i],
|
|
)
|
|
title = data_cols_to_compare[i] + " vs " + info_cols[y_axis_index]
|
|
# Create Plotly line chart
|
|
fig = px.line(
|
|
df_melted,
|
|
x=info_cols[y_axis_index],
|
|
y=data_cols_to_compare[i],
|
|
color="Configuration",
|
|
title=title,
|
|
markers=True,
|
|
)
|
|
# Export to HTML
|
|
text_file.write(fig.to_html(full_html=True, include_plotlyjs="cdn"))
|