diff --git a/CHANGELOG.md b/CHANGELOG.md index 361cf3855..0742bf7ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ - update to **Torch 2.1** if you get file not found errors, set DISABLE_IPEXRUN=1 and run the webui with --reinstall - built-in *MKL* and *DPCPP* for IPEX, no need to install OneAPI anymore + - **StableVideoDiffusion** is now supported with IPEX - fix IPEX Optimize not applying with Diffusers backend - fix garbled outputs with Stable Video Diffusion - disable 32 bit workarounds if the GPU supports 64 bit diff --git a/modules/processing_diffusers.py b/modules/processing_diffusers.py index 3395d370f..674401e16 100644 --- a/modules/processing_diffusers.py +++ b/modules/processing_diffusers.py @@ -89,7 +89,7 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro if kwargs.get('latents', None) is None: return kwargs kwargs = correction_callback(p, timestep, kwargs) - if p.scheduled_prompt: + if p.scheduled_prompt and hasattr(kwargs, 'prompt_embeds') and hasattr(kwargs, 'negative_prompt_embeds'): try: i = (step + 1) % len(p.prompt_embeds) kwargs["prompt_embeds"] = p.prompt_embeds[i][0:1].repeat(1, kwargs["prompt_embeds"].shape[0], 1).view( @@ -346,7 +346,10 @@ def process_diffusers(p: StableDiffusionProcessing, seeds, prompts, negative_pro args['callback'] = diffusers_callback_legacy elif 'callback_on_step_end_tensor_inputs' in possible: args['callback_on_step_end'] = diffusers_callback - args['callback_on_step_end_tensor_inputs'] = ['latents', 'prompt_embeds', 'negative_prompt_embeds'] + if 'prompt_embeds' in possible and 'negative_prompt_embeds' in possible: + args['callback_on_step_end_tensor_inputs'] = ['latents', 'prompt_embeds', 'negative_prompt_embeds'] + else: + args['callback_on_step_end_tensor_inputs'] = ['latents'] for arg in kwargs: if arg in possible: # add kwargs args[arg] = kwargs[arg] diff --git a/modules/shared.py b/modules/shared.py index c6facfd21..8d887e650 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -153,7 +153,7 @@ def refresh_vaes(): def refresh_upscalers(): - import modules.modelloader + import modules.modelloader # pylint: disable=W0621 modules.modelloader.load_upscalers() diff --git a/wiki b/wiki index 0041ca2ab..d33eb1c02 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 0041ca2ab7b57624e5b6448856a1ae88e295636a +Subproject commit d33eb1c0220c3af5243ee72e32c44c6d9eba1101