diff --git a/extensions-builtin/sd-webui-agent-scheduler b/extensions-builtin/sd-webui-agent-scheduler index e8d02c7e1..310bb4eac 160000 --- a/extensions-builtin/sd-webui-agent-scheduler +++ b/extensions-builtin/sd-webui-agent-scheduler @@ -1 +1 @@ -Subproject commit e8d02c7e119a890175ab2bf6649acdbcd743b861 +Subproject commit 310bb4eace9e7fc03074dd49a91797bd6df2c43b diff --git a/modules/scripts_auto_postprocessing.py b/modules/scripts_auto_postprocessing.py index eda6ee779..2233a39d1 100644 --- a/modules/scripts_auto_postprocessing.py +++ b/modules/scripts_auto_postprocessing.py @@ -18,7 +18,6 @@ class ScriptPostprocessingForMainUI(scripts.Script): def postprocess_image(self, p, script_pp, *args): # pylint: disable=arguments-differ args_dict = dict(zip(self.postprocessing_controls, args)) - pp = scripts_postprocessing.PostprocessedImage(script_pp.image) pp.info = {} self.script.process(pp, **args_dict) @@ -34,5 +33,4 @@ def create_auto_preprocessing_script_data(): continue constructor = lambda s=script: ScriptPostprocessingForMainUI(s.script_class()) # pylint: disable=unnecessary-lambda-assignment res.append(scripts.ScriptClassData(script_class=constructor, path=script.path, basedir=script.basedir, module=script.module)) - return res diff --git a/modules/sd_models.py b/modules/sd_models.py index e4fb27dcf..7b00a997c 100644 --- a/modules/sd_models.py +++ b/modules/sd_models.py @@ -1105,14 +1105,12 @@ def unload_model_weights(op='model'): devices.torch_gc(force=True) -def apply_token_merging(sd_model, token_merging_ratio): +def apply_token_merging(sd_model, token_merging_ratio=0): current_token_merging_ratio = getattr(sd_model, 'applied_token_merged_ratio', 0) - # shared.log.debug(f'Appplying token merging: current={current_token_merging_ratio} target={token_merging_ratio}') - if current_token_merging_ratio == token_merging_ratio: + if token_merging_ratio is None or current_token_merging_ratio == token_merging_ratio: return if current_token_merging_ratio > 0: tomesd.remove_patch(sd_model) - if token_merging_ratio > 0: tomesd.apply_patch( sd_model, diff --git a/webui.py b/webui.py index e252fa36d..99f426a48 100644 --- a/webui.py +++ b/webui.py @@ -15,6 +15,7 @@ from modules import timer, errors, paths # pylint: disable=unused-import startup_timer = timer.Timer() local_url = None +logging.getLogger("DeepSpeed").disabled = True import torch # pylint: disable=C0411 try: import intel_extension_for_pytorch as ipex # pylint: disable=import-error, unused-import