diff --git a/modules/processing.py b/modules/processing.py index 3585cbd60..268661647 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -311,24 +311,24 @@ def process_samples(p: StableDiffusionProcessing, samples): images.save_image(image_mask_composite, p.outpath_samples, "", p.seeds[i], p.prompts[i], shared.opts.samples_format, info=info, p=p, suffix="-mask-composite") if shared.opts.return_mask: out_infotexts.append(info) - out_images.append(image_mask) + out_images.append(image_mask) if shared.opts.return_mask_composite: out_infotexts.append(info) - out_images.append(image_mask_composite) + out_images.append(image_mask_composite) if shared.opts.include_mask: if shared.opts.mask_apply_overlay and p.overlay_images is not None and len(p.overlay_images) > 0: p.image_mask = create_binary_mask(p.overlay_images[0]) p.image_mask = ImageOps.invert(p.image_mask) out_infotexts.append(info) - out_images.append(p.image_mask) + out_images.append(p.image_mask) elif getattr(p, 'image_mask', None) is not None and isinstance(p.image_mask, Image.Image): if getattr(p, 'mask_for_detailer', None) is not None: out_infotexts.append(info) - out_images.append(p.mask_for_detailer) + out_images.append(p.mask_for_detailer) else: out_infotexts.append(info) - out_images.append(p.image_mask) + out_images.append(p.image_mask) if p.selected_scale_tab_after == 1: p.width_after, p.height_after = int(image.width * p.scale_by_after), int(image.height * p.scale_by_after) @@ -340,7 +340,7 @@ def process_samples(p: StableDiffusionProcessing, samples): image.info["parameters"] = info out_infotexts.append(info) - out_images.append(image) + out_images.append(image) return out_images, out_infotexts diff --git a/modules/sd_hijack_accelerate.py b/modules/sd_hijack_accelerate.py index 2ff355769..834038a41 100644 --- a/modules/sd_hijack_accelerate.py +++ b/modules/sd_hijack_accelerate.py @@ -63,10 +63,10 @@ def hijack_set_module_tensor_simple( old_value = getattr(module, tensor_name) with devices.inference_context(): if tensor_name in module._buffers: # pylint: disable=protected-access - module._buffers[tensor_name] = value.to(device, non_blocking=shared.opts.diffusers_offload_nonblocking) # pylint: disable=protected-access + module._buffers[tensor_name] = value.to(device, non_blocking=False) # pylint: disable=protected-access elif value is not None or not devices.same_device(device, module._parameters[tensor_name].device): # pylint: disable=protected-access param_cls = type(module._parameters[tensor_name]) # pylint: disable=protected-access - module._parameters[tensor_name] = param_cls(value, requires_grad=old_value.requires_grad).to(device, non_blocking=shared.opts.diffusers_offload_nonblocking) # pylint: disable=protected-access + module._parameters[tensor_name] = param_cls(value, requires_grad=old_value.requires_grad).to(device, non_blocking=False) # pylint: disable=protected-access t1 = time.time() tensor_to_timer += (t1 - t0) diff --git a/modules/sd_offload.py b/modules/sd_offload.py index 624ab52ef..689c49e8c 100644 --- a/modules/sd_offload.py +++ b/modules/sd_offload.py @@ -325,7 +325,7 @@ def move_module_to_cpu(module, op='unk'): errors.display(e, f'Offload: type=balanced op=apply module={getattr(module, "__name__", None)}') -def apply_balanced_offload_to_module(module, checkpoint_name="", op="apply"): +def apply_balanced_offload_to_module(module, op="apply"): module_name = getattr(module, "module_name", module.__class__.__name__) network_layer_name = getattr(module, "network_layer_name", None) device_map = getattr(module, "balanced_offload_device_map", None) @@ -381,7 +381,7 @@ def apply_balanced_offload(sd_model=None, exclude=[]): continue module.module_name = module_name module.offload_dir = os.path.join(shared.opts.accelerate_offload_path, checkpoint_name, module_name) - apply_balanced_offload_to_module(module, checkpoint_name=checkpoint_name) + apply_balanced_offload_to_module(module, op='apply') set_accelerate(sd_model) t = time.time() - t0 process_timer.add('offload', t) diff --git a/modules/ui_settings.py b/modules/ui_settings.py index b4595665f..0687e9a6f 100644 --- a/modules/ui_settings.py +++ b/modules/ui_settings.py @@ -276,10 +276,10 @@ def create_ui(): shutdown_submit.click(fn=lambda: shared.restart_server(restart=False), _js="restartReload") -def reset_quicksettings(components): - components = components.split(',') +def reset_quicksettings(quick_components): + quick_components = quick_components.split(',') updates = [] - for key in components: + for key in quick_components: shared.log.warning(f'Reset: setting={key}') updates.append(gr.update(value=shared.opts.get_default(key))) return updates diff --git a/pipelines/chroma/convert_chroma.py b/pipelines/chroma/convert_chroma.py index 769cf7629..ea49d3bee 100644 --- a/pipelines/chroma/convert_chroma.py +++ b/pipelines/chroma/convert_chroma.py @@ -1,11 +1,10 @@ -from rich import print as rprint -rprint('starting chroma conversion') import os import torch import transformers import diffusers import huggingface_hub as hf +from rich import print as rprint from rich.traceback import install as install_traceback @@ -25,6 +24,7 @@ dtype = torch.bfloat16 device = torch.device('cuda') +rprint('starting chroma conversion') install_traceback(show_locals=False) rprint(f'torch={torch.__version__} diffusers={diffusers.__version__} transformers={transformers.__version__}') for input_file in input_files: @@ -40,7 +40,7 @@ for input_file in input_files: cache_dir=cache_dir, ).to(device) - rprint(f'load text-encoder') + rprint('load text-encoder') text_encoder = transformers.T5EncoderModel.from_pretrained( "black-forest-labs/FLUX.1-schnell", subfolder="text_encoder_2", @@ -48,14 +48,14 @@ for input_file in input_files: cache_dir=cache_dir, ).to(device) - rprint(f'load tokenizer') + rprint('load tokenizer') tokenizer = transformers.T5Tokenizer.from_pretrained( "black-forest-labs/FLUX.1-schnell", subfolder="tokenizer_2", cache_dir=cache_dir, ) - rprint(f'load pipeline') + rprint('load pipeline') pipe = diffusers.ChromaPipeline.from_pretrained( "black-forest-labs/FLUX.1-dev", transformer=transformer, @@ -89,7 +89,7 @@ for input_file in input_files: private=False, token=hf_token, ) - + pipe = None -rprint(f'done') +rprint('done')