Merge pull request #10414 from AUTOMATIC1111/xyz-token-merging

xyz token merging
This commit is contained in:
AUTOMATIC1111 2023-05-17 18:06:55 +03:00 committed by GitHub
commit 3c81d184c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -144,6 +144,11 @@ def apply_face_restore(p, opt, x):
p.restore_faces = is_active p.restore_faces = is_active
def apply_override(field):
def fun(p, x, xs):
p.override_settings[field] = x
return fun
def format_value_add_label(p, opt, x): def format_value_add_label(p, opt, x):
if type(x) == float: if type(x) == float:
x = round(x, 8) x = round(x, 8)
@ -224,6 +229,8 @@ axis_options = [
AxisOption("Styles", str, apply_styles, choices=lambda: list(shared.prompt_styles.styles)), AxisOption("Styles", str, apply_styles, choices=lambda: list(shared.prompt_styles.styles)),
AxisOption("UniPC Order", int, apply_uni_pc_order, cost=0.5), AxisOption("UniPC Order", int, apply_uni_pc_order, cost=0.5),
AxisOption("Face restore", str, apply_face_restore, format_value=format_value), AxisOption("Face restore", str, apply_face_restore, format_value=format_value),
AxisOption("Token merging ratio", float, apply_override('token_merging_ratio')),
AxisOption("Token merging ratio high-res", float, apply_override('token_merging_ratio_hr')),
] ]