mirror of
https://github.com/vladmandic/automatic
synced 2026-09-19 09:14:35 +02:00
make extension disabling for diffusers temporary
This commit is contained in:
@@ -141,6 +141,7 @@ def list_extensions():
|
||||
continue
|
||||
extension_names.append(extension_dirname)
|
||||
extension_paths.append((extension_dirname, path, dirname == extensions_builtin_dir))
|
||||
disabled_extensions = shared.opts.disabled_extensions + shared.temp_disable_extensions()
|
||||
for dirname, path, is_builtin in extension_paths:
|
||||
extension = Extension(name=dirname, path=path, enabled=dirname not in shared.opts.disabled_extensions, is_builtin=is_builtin)
|
||||
extension = Extension(name=dirname, path=path, enabled=dirname not in disabled_extensions, is_builtin=is_builtin)
|
||||
extensions.append(extension)
|
||||
|
||||
@@ -693,7 +693,7 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
|
||||
return ''
|
||||
|
||||
ema_scope_context = p.sd_model.ema_scope if shared.backend == shared.Backend.ORIGINAL else nullcontext
|
||||
with torch.inference_mode(), ema_scope_context():
|
||||
with torch.no_grad(), ema_scope_context():
|
||||
t0 = time.time()
|
||||
with devices.autocast():
|
||||
p.init(p.all_prompts, p.all_seeds, p.all_subseeds)
|
||||
|
||||
+5
-6
@@ -272,18 +272,17 @@ def list_themes():
|
||||
return themes
|
||||
|
||||
|
||||
def disable_extensions():
|
||||
def temp_disable_extensions():
|
||||
disabled = []
|
||||
if opts.lyco_patch_lora and backend != Backend.DIFFUSERS:
|
||||
if 'Lora' not in opts.disabled_extensions:
|
||||
opts.data['disabled_extensions'].append('Lora')
|
||||
opts.data['sd_lora'] = ''
|
||||
else:
|
||||
opts.data['disabled_extensions'] = [x for x in opts.disabled_extensions if x != 'Lora']
|
||||
disabled.append('Lora')
|
||||
if backend == Backend.DIFFUSERS:
|
||||
for ext in ['sd-webui-controlnet', 'multidiffusion-upscaler-for-automatic1111', 'a1111-sd-webui-lycoris']:
|
||||
if ext not in opts.disabled_extensions:
|
||||
log.warning(f'Diffusers disabling uncompatible extension: {ext}')
|
||||
opts.data['disabled_extensions'].append(ext)
|
||||
disabled.append(ext)
|
||||
return disabled
|
||||
|
||||
|
||||
def refresh_themes():
|
||||
|
||||
Reference in New Issue
Block a user