mirror of
https://github.com/vladmandic/automatic
synced 2026-09-19 17:24:32 +02:00
fix style apply params
Signed-off-by: Vladimir Mandic <mandic00@live.com>
This commit is contained in:
@@ -179,6 +179,7 @@ Models...And support for new models: **CogView-4**, **SANA 1.5**,
|
||||
- fix sampler metadata when using default sampler
|
||||
- fix paste incorrect float to int cast
|
||||
- fix server restart from ui
|
||||
- fix style apply params
|
||||
- do not allow edit of built-in styles
|
||||
- improve lora compatibility with balanced offload
|
||||
|
||||
|
||||
@@ -205,5 +205,5 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork):
|
||||
shared.log.debug(f"Network end: type=LoRA time={l.timer.summary}")
|
||||
if self.errors:
|
||||
for k, v in self.errors.items():
|
||||
shared.log.error(f'LoRA: name="{k}" errors={v}')
|
||||
shared.log.error(f'Network: type=LoRA name="{k}" errors={v}')
|
||||
self.errors.clear()
|
||||
|
||||
@@ -101,9 +101,9 @@ def network_calc_weights(self: Union[torch.nn.Conv2d, torch.nn.Linear, torch.nn.
|
||||
l.timer.move += t1 - t0
|
||||
except RuntimeError as e:
|
||||
l.extra_network_lora.errors[net.name] = l.extra_network_lora.errors.get(net.name, 0) + 1
|
||||
module_name = net.modules.get(network_layer_name, None)
|
||||
shared.log.error(f'Network: type=LoRA name="{net.name}" module="{module_name}" layer="{network_layer_name}" apply weight: {e}')
|
||||
if l.debug:
|
||||
module_name = net.modules.get(network_layer_name, None)
|
||||
shared.log.error(f'LoRA apply weight name="{net.name}" module="{module_name}" layer="{network_layer_name}" {e}')
|
||||
errors.display(e, 'LoRA')
|
||||
raise RuntimeError('LoRA apply weight') from e
|
||||
continue
|
||||
|
||||
+6
-4
@@ -154,6 +154,7 @@ def apply_styles_to_extra(p, style: Style):
|
||||
p.original_negative = p.negative_prompt
|
||||
|
||||
style_extra = apply_wildcards_to_prompt(style.extra, [style.wildcards], silent=True)
|
||||
style_extra = ' ' + style_extra.lower()
|
||||
extra.update(infotext.parse(style_extra))
|
||||
extra.pop('Prompt', None)
|
||||
extra.pop('Negative prompt', None)
|
||||
@@ -162,14 +163,15 @@ def apply_styles_to_extra(p, style: Style):
|
||||
for k, v in extra.items():
|
||||
k = k.lower()
|
||||
k = k.replace(' ', '_')
|
||||
if k in name_exclude: # exclude some fields
|
||||
continue
|
||||
if k in name_map: # rename some fields
|
||||
k = name_map[k]
|
||||
if k in name_exclude: # exclude some fields
|
||||
continue
|
||||
if hasattr(p, k):
|
||||
orig = getattr(p, k)
|
||||
if type(orig) != type(v) and orig is not None:
|
||||
v = type(orig)(v)
|
||||
if (type(orig) != type(v)) and (orig is not None):
|
||||
if not (type(orig) == int and type(v) == float): # dont convert float to int
|
||||
v = type(orig)(v)
|
||||
setattr(p, k, v)
|
||||
fields.append(f'{k}={v}')
|
||||
else:
|
||||
|
||||
Reference in New Issue
Block a user