xsl
94cdfd6de5
代码改动: - comfyui.py: run() 新增 unet_name 参数，提交前自动改写模型节点 (.gguf→UnetLoaderGGUF, .safetensors→UNETLoader)，并按模型自动同步 文本编码器(4b→qwen_3_4b, 9b→qwen_3_8b)，避免切换时维度不匹配 - redraw.py: run_redraw() 透传 unet_name - service.py: generate_grow_results_swap/generate_grow_results 支持 redraw_max_side(分辨率参数化) 和 unet_name 透传 - app.py: 接口2 新增 flux_model/redraw_max_side 两个 Form 参数(男女路径都加) - test_interface2.html: 新增 Flux模型/压图长边 下拉选择器 - add_hair.json/0716add-hair-api.json: 工作流默认模型改为 9b 测试脚本: - benchmark_matrix.py: 4模型×3分辨率×3图×3次 矩阵测试 - benchmark_hairstyle.py: 3图×5发型×10组合 发型对比测试 - benchmark_report.py/benchmark_hairstyle_report.py: HTML报告生成 清理: - .gitignore: 排除 benchmark_out/、报告HTML、gateway.log、*.bak.* - 移除 gateway.log 的 git 跟踪
123 lines
4.7 KiB
Python
123 lines
4.7 KiB
Python
#!/usr/bin/env python3
|
||
# -*- coding: utf-8 -*-
|
||
"""把发型对比测试结果生成 HTML 报告。
|
||
15行(3图×5发型) × 10列(4b@896 + 9b三模型×三分辨率)，每行首列=原图。
|
||
图片 base64 内嵌，自包含单文件。
|
||
"""
|
||
import base64
|
||
import json
|
||
import os
|
||
from pathlib import Path
|
||
|
||
OUT = Path("/home/ubuntu/hair/benchmark_out/hairstyle")
|
||
RESULTS = OUT / "results.json"
|
||
HTML = OUT / "report.html"
|
||
|
||
|
||
def img_b64(path):
|
||
if not path or not os.path.isfile(path):
|
||
return None
|
||
with open(path, "rb") as f:
|
||
return f"data:image/jpeg;base64,{base64.b64encode(f.read()).decode()}"
|
||
|
||
|
||
def main():
|
||
d = json.load(open(RESULTS, encoding="utf-8"))
|
||
columns = d["columns"]
|
||
rows = d["rows"]
|
||
|
||
# 统计每列的平均耗时、峰值显存
|
||
col_stats = {}
|
||
for ct in columns:
|
||
times, peaks = [], []
|
||
for r in rows:
|
||
for c in r["cells"]:
|
||
if c.get("title") == ct and not c.get("error"):
|
||
times.append(c["elapsed"])
|
||
peaks.append(c["gpu_peak"])
|
||
col_stats[ct] = {
|
||
"avg_t": sum(times) / len(times) if times else 0,
|
||
"max_p": max(peaks) / 1024 if peaks else 0,
|
||
}
|
||
|
||
# 表头：原图 + 10列
|
||
headers = ['<th class="col-label">原图</th>']
|
||
for ct in columns:
|
||
s = col_stats[ct]
|
||
headers.append(
|
||
f'<th class="col-label"><div class="col-title">{ct}</div>'
|
||
f'<div class="col-stat">{s["avg_t"]:.0f}s · {s["max_p"]:.0f}G</div></th>'
|
||
)
|
||
|
||
# 表体：15行
|
||
body_rows = []
|
||
for r in rows:
|
||
# 发型+图标签
|
||
label = f'<div class="row-label">{r["img"]}<br><b>{r["hair_name"]}</b></div>'
|
||
# 原图
|
||
orig = img_b64(r["img_path"])
|
||
cells = [f'<td class="cell-orig"><div class="row-label-cell">{label}</div>'
|
||
f'<img class="orig-img" src="{orig}"></td>']
|
||
# 10个结果列
|
||
for ct in columns:
|
||
c = next((x for x in r["cells"] if x.get("title") == ct), {})
|
||
uri = img_b64(c.get("grown_path")) if not c.get("error") else None
|
||
if uri:
|
||
cells.append(
|
||
f'<td class="cell-result"><img class="result-img" src="{uri}" loading="lazy">'
|
||
f'<div class="cell-time">{c["elapsed"]:.1f}s</div></td>')
|
||
else:
|
||
cells.append(f'<td class="cell-result"><div class="na">⚠</div></td>')
|
||
body_rows.append(f'<tr>{"".join(cells)}</tr>')
|
||
|
||
html = f"""<!DOCTYPE html>
|
||
<html lang="zh-CN">
|
||
<head>
|
||
<meta charset="UTF-8">
|
||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||
<title>发型对比测试报告 — 4模型×3分辨率</title>
|
||
<style>
|
||
* {{ box-sizing: border-box; margin: 0; padding: 0; }}
|
||
body {{ font-family: -apple-system, "Segoe UI", sans-serif; background: #f5f5f5; padding: 16px; }}
|
||
h1 {{ font-size: 20px; margin-bottom: 4px; }}
|
||
.subtitle {{ color: #888; font-size: 12px; margin-bottom: 12px; }}
|
||
.legend {{ background: #fff; border-radius: 8px; padding: 10px 16px; margin-bottom: 12px; font-size: 12px; color: #555; }}
|
||
.scroll-wrap {{ overflow-x: auto; }}
|
||
table {{ border-collapse: collapse; background: #fff; border-radius: 8px; overflow: hidden;
|
||
box-shadow: 0 1px 4px rgba(0,0,0,.06); }}
|
||
th, td {{ border: 1px solid #eee; padding: 6px; vertical-align: top; text-align: center; }}
|
||
th {{ background: #f9fafb; position: sticky; top: 0; }}
|
||
.col-label {{ min-width: 110px; max-width: 130px; }}
|
||
.col-title {{ font-size: 12px; font-weight: 700; color: #374151; }}
|
||
.col-stat {{ font-size: 10px; color: #9ca3af; margin-top: 2px; }}
|
||
.row-label {{ font-size: 11px; color: #6b7280; }}
|
||
.row-label b {{ color: #1f2937; }}
|
||
.row-label-cell {{ font-size: 11px; color: #6b7280; margin-bottom: 4px; }}
|
||
.row-label-cell b {{ color: #1f2937; font-size: 13px; }}
|
||
img {{ border-radius: 4px; max-width: 120px; max-height: 150px; object-fit: contain; background: #f3f4f6; }}
|
||
.orig-img {{ border: 2px solid #d1d5db; max-height: 130px; }}
|
||
.cell-time {{ font-size: 10px; color: #9ca3af; margin-top: 2px; }}
|
||
.na {{ color: #d1d5db; font-size: 16px; padding: 40px; }}
|
||
</style>
|
||
</head>
|
||
<body>
|
||
<h1>💇 发型对比测试报告</h1>
|
||
<p class="subtitle">接口2女性 · 3图×5发型=15行 · 每行: 4B@896(1) + 9B(fp8/Q5/Q4)×(原图/896/640)(9) · 150/150成功 · RTX3090</p>
|
||
<div class="legend">列标题下显示<b>平均耗时 · 峰值显存</b>。横向滚动查看更多列。原图列含图片名+发型名。</div>
|
||
<div class="scroll-wrap">
|
||
<table>
|
||
<tr>{"".join(headers)}</tr>
|
||
{"".join(body_rows)}
|
||
</table>
|
||
</div>
|
||
</body>
|
||
</html>"""
|
||
|
||
with open(HTML, "w", encoding="utf-8") as f:
|
||
f.write(html)
|
||
print(f"✓ 报告: {HTML} ({HTML.stat().st_size//1024} KB)")
|
||
|
||
|
||
if __name__ == "__main__":
|
||
main()
|