aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorw-e-w <40751091+w-e-w@users.noreply.github.com>2024-01-18 04:44:21 +0900
committerw-e-w <40751091+w-e-w@users.noreply.github.com>2024-01-18 04:44:21 +0900
commit2cf23099ebb81832a27c8016f14062885f5a9c98 (patch)
tree13fc3e55794b34c06f2be500b041b1589ea1f09e
parente1dfd452c0447e729a7341c434b4aab6063aa654 (diff)
fix console total progress bar when using txt2img_upscale
add p.txt2img_upscale as indicator
-rw-r--r--modules/processing.py7
-rw-r--r--modules/txt2img.py1
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/processing.py b/modules/processing.py
index dcc807fe..547ab2f8 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -1227,8 +1227,11 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
if not state.processing_has_refined_job_count:
if state.job_count == -1:
state.job_count = self.n_iter
-
- shared.total_tqdm.updateTotal((self.steps + (self.hr_second_pass_steps or self.steps)) * state.job_count)
+ if getattr(self, 'txt2img_upscale', False):
+ total_steps = (self.hr_second_pass_steps or self.steps) * state.job_count
+ else:
+ total_steps = (self.steps + (self.hr_second_pass_steps or self.steps)) * state.job_count
+ shared.total_tqdm.updateTotal(total_steps)
state.job_count = state.job_count * 2
state.processing_has_refined_job_count = True
diff --git a/modules/txt2img.py b/modules/txt2img.py
index 92a160d6..4efcb4c3 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -64,6 +64,7 @@ def txt2img_upscale(id_task: str, request: gr.Request, gallery, gallery_index, g
p.enable_hr = True
p.batch_size = 1
p.n_iter = 1
+ p.txt2img_upscale = True
geninfo = json.loads(generation_info)