From 23ec02c2294b01a03b1d36a377eb51040b83235d Mon Sep 17 00:00:00 2001 From: papuSpartan Date: Sat, 5 Oct 2024 03:32:42 -0500 Subject: [PATCH] fix for controlnet --- scripts/distributed.py | 2 +- scripts/spartan/world.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/distributed.py b/scripts/distributed.py index 9992729..b3c10f6 100644 --- a/scripts/distributed.py +++ b/scripts/distributed.py @@ -128,7 +128,7 @@ class DistributedScript(scripts.Script): gallery_index = num_local + num_injected + i # zero-indexed point of image in total gallery job.gallery_map.append(gallery_index) # so we know where to edit infotext pp.images.append(image) - logger.debug(f"image {gallery_index + 1}/{self.world.num_total()}") + logger.debug(f"image {gallery_index + 1}/{self.world.num_gallery()}") def update_gallery(self, pp, p): """adds all remotely generated images to the image gallery after waiting for all workers to finish""" diff --git a/scripts/spartan/world.py b/scripts/spartan/world.py index a1e5ee1..9ff7ceb 100644 --- a/scripts/spartan/world.py +++ b/scripts/spartan/world.py @@ -286,8 +286,8 @@ class World: return num_images - def num_total(self) -> int: - """how many images should be returned in total, so including local generations and its grid""" + def num_gallery(self) -> int: + """How many images should appear in the gallery. This includes local generations and a grid(if enabled)""" return self.num_requested() * self.p.n_iter + shared.opts.return_grid