openvinotoolkit/stable-diffusion-webui
1
1
Fork 0
mirror of https://github.com/openvinotoolkit/stable-diffusion-webui.git synced 2024-12-15 07:03:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect display/calculation for number of steps for hires fix in progress bars

Browse Source
This commit is contained in:
AUTOMATIC 2023-01-04 23:56:43 +03:00
parent 8149078094
commit bc43293c64
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/processing.py
View File

@ -685,10 +685,13 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
def init(self, all_prompts, all_seeds, all_subseeds): def init(self, all_prompts, all_seeds, all_subseeds):
if self.enable_hr: if self.enable_hr:
if state.job_count == -1: if not state.processing_has_refined_job_count:
state.job_count = self.n_iter * 2 if state.job_count == -1:
else: state.job_count = self.n_iter
shared.total_tqdm.updateTotal((self.steps + (self.hr_second_pass_steps or self.steps)) * state.job_count)
state.job_count = state.job_count * 2 state.job_count = state.job_count * 2
state.processing_has_refined_job_count = True
if self.hr_resize_x == 0 and self.hr_resize_y == 0: if self.hr_resize_x == 0 and self.hr_resize_y == 0:
self.extra_generation_params["Hires upscale"] = self.hr_scale self.extra_generation_params["Hires upscale"] = self.hr_scale

5
modules/sd_samplers.py
View File

@ -97,8 +97,9 @@ sampler_extra_params = {
def setup_img2img_steps(p, steps=None): def setup_img2img_steps(p, steps=None):
if opts.img2img_fix_steps or steps is not None: if opts.img2img_fix_steps or steps is not None:
steps = int((steps or p.steps) / min(p.denoising_strength, 0.999)) if p.denoising_strength > 0 else 0 requested_steps = (steps or p.steps)
t_enc = p.steps - 1 steps = int(requested_steps / min(p.denoising_strength, 0.999)) if p.denoising_strength > 0 else 0
t_enc = requested_steps - 1
else: else:
steps = p.steps steps = p.steps
t_enc = int(min(p.denoising_strength, 0.999) * steps) t_enc = int(min(p.denoising_strength, 0.999) * steps)

4
modules/shared.py
View File

@ -153,6 +153,7 @@ class State:
job = "" job = ""
job_no = 0 job_no = 0
job_count = 0 job_count = 0
processing_has_refined_job_count = False
job_timestamp = '0' job_timestamp = '0'
sampling_step = 0 sampling_step = 0
sampling_steps = 0 sampling_steps = 0
@ -194,6 +195,7 @@ class State:
def begin(self): def begin(self):
self.sampling_step = 0 self.sampling_step = 0
self.job_count = -1 self.job_count = -1
self.processing_has_refined_job_count = False
self.job_no = 0 self.job_no = 0
self.job_timestamp = datetime.datetime.now().strftime("%Y%m%d%H%M%S") self.job_timestamp = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
self.current_latent = None self.current_latent = None
@ -608,7 +610,7 @@ class TotalTQDM:
return return
if self._tqdm is None: if self._tqdm is None:
self.reset() self.reset()
self._tqdm.total=new_total self._tqdm.total = new_total
def clear(self): def clear(self):
if self._tqdm is not None: if self._tqdm is not None: