diff --git a/modules/sd_models.py b/modules/sd_models.py index 0a82e0e07..dd3368eff 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -847,6 +847,9 @@ def load_diffuser(checkpoint_info=None, already_loaded_state_dict=None, timer=No } if hasattr(pipeline, 'from_single_file'): diffusers_load_config['use_safetensors'] = True + if shared.opts.disable_accelerate: + from diffusers.utils import import_utils + import_utils._accelerate_available = False # pylint: disable=protected-access sd_model = pipeline.from_single_file(checkpoint_info.path, **diffusers_load_config) if sd_model is not None and hasattr(sd_model, 'unet') and hasattr(sd_model.unet, 'config') and 'inpainting' in checkpoint_info.path.lower(): shared.log.debug('Model patch: type=inpaint') diff --git a/modules/shared.py b/modules/shared.py index 212566d8e..326ae4c23 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -412,6 +412,7 @@ options_templates.update(options_section(('diffusers', "Diffusers Settings"), { "diffusers_vae_load_variant": OptionInfo("default", "Diffusers VAE loading variant", gr.Radio, {"choices": ['default', 'fp32', 'fp16']}), "custom_diffusers_pipeline": OptionInfo('', 'Load custom Diffusers pipeline'), "diffusers_eval": OptionInfo(True, "Force model eval"), + "disable_accelerate": OptionInfo(False, "Disable use of accelerate library"), "diffusers_force_zeros": OptionInfo(True, "Force zeros for prompts when empty"), "diffusers_aesthetics_score": OptionInfo(False, "Require aesthetics score"), "diffusers_pooled": OptionInfo("default", "Diffusers SDXL pooled embeds (experimental)", gr.Radio, {"choices": ['default', 'weighted']}), diff --git a/requirements.txt b/requirements.txt index 3922292be..4c0390e73 100644 --- a/requirements.txt +++ b/requirements.txt @@ -52,7 +52,7 @@ torchsde==0.2.6 antlr4-python3-runtime==4.9.3 requests==2.31.0 tqdm==4.66.1 -accelerate==0.25.0 +accelerate==0.26.1 opencv-contrib-python-headless==4.8.1.78 diffusers==0.25.0 einops==0.4.1 diff --git a/wiki b/wiki index c47ef6e70..1c90ea206 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit c47ef6e70c60bcf53ba1c16d3ffeaea6401501c0 +Subproject commit 1c90ea20655a0ee7d6ad041eaa0131df7a51027b