From 7ce7fb01e035a7ba8ca9cb35784cd75cca3d99fd Mon Sep 17 00:00:00 2001 From: AUTOMATIC <16777216c@gmail.com> Date: Tue, 6 Sep 2022 23:10:12 +0300 Subject: fix for live progress breaking lowvram and medvram optimizations --- modules/ui.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'modules/ui.py') diff --git a/modules/ui.py b/modules/ui.py index fb3c4d33..92d8bcdd 100644 --- a/modules/ui.py +++ b/modules/ui.py @@ -160,13 +160,11 @@ def check_progress_call(): preview_visibility = gr_show(False) if opts.show_progress_every_n_steps > 0: - if shared.state.current_progress_index % opts.show_progress_every_n_steps == 0 and shared.state.current_latent is not None: - x_sample = shared.sd_model.decode_first_stage(shared.state.current_latent[0:1].type(shared.sd_model.dtype))[0] - x_sample = torch.clamp((x_sample + 1.0) / 2.0, min=0.0, max=1.0) - x_sample = 255. * np.moveaxis(x_sample.cpu().numpy(), 0, 2) - x_sample = x_sample.astype(np.uint8) - shared.state.current_image = Image.fromarray(x_sample) + if shared.parallel_processing_allowed: + if shared.state.sampling_step - shared.state.current_image_sampling_step >= opts.show_progress_every_n_steps and shared.state.current_latent is not None: + shared.state.current_image = modules.sd_samplers.sample_to_image(shared.state.current_latent) + shared.state.current_image_sampling_step = shared.state.sampling_step image = shared.state.current_image @@ -175,8 +173,6 @@ def check_progress_call(): else: preview_visibility = gr_show(True) - shared.state.current_progress_index += 1 - return f"{time.time()}

{progressbar}

", preview_visibility, image -- cgit v1.2.1