From a0d721e109d7c7b75aefaf3853f7bf58da43847b Mon Sep 17 00:00:00 2001 From: AUTOMATIC1111 <16777216c@gmail.com> Date: Sun, 20 Aug 2023 13:00:59 +0300 Subject: make live preview display work independently from progress bar --- modules/progress.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'modules/progress.py') diff --git a/modules/progress.py b/modules/progress.py index f405f07f..e32b59dd 100644 --- a/modules/progress.py +++ b/modules/progress.py @@ -48,6 +48,7 @@ def add_task_to_queue(id_job): class ProgressRequest(BaseModel): id_task: str = Field(default=None, title="Task ID", description="id of the task to get progress for") id_live_preview: int = Field(default=-1, title="Live preview image ID", description="id of last received last preview image") + live_preview: bool = Field(default=True, title="Include live preview", description="boolean flag indicating whether to include the live preview image") class ProgressResponse(BaseModel): @@ -91,7 +92,7 @@ def progressapi(req: ProgressRequest): id_live_preview = req.id_live_preview shared.state.set_current_image() - if opts.live_previews_enable and shared.state.id_live_preview != req.id_live_preview: + if opts.live_previews_enable and req.live_preview and shared.state.id_live_preview != req.id_live_preview: image = shared.state.current_image if image is not None: buffered = io.BytesIO() -- cgit v1.2.3 From 71a0f6ef85f2124d5fb25b55d6ec577a56265fe4 Mon Sep 17 00:00:00 2001 From: AnyISalIn Date: Mon, 21 Aug 2023 17:48:56 +0800 Subject: feat: replace threading.Lock() to FIFOLock Signed-off-by: AnyISalIn --- modules/call_queue.py | 5 ++--- modules/fifo_lock.py | 37 +++++++++++++++++++++++++++++++++++++ modules/progress.py | 7 ++++++- 3 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 modules/fifo_lock.py (limited to 'modules/progress.py') diff --git a/modules/call_queue.py b/modules/call_queue.py index f2eb17d6..ddf0d573 100644 --- a/modules/call_queue.py +++ b/modules/call_queue.py @@ -1,11 +1,10 @@ from functools import wraps import html -import threading import time -from modules import shared, progress, errors, devices +from modules import shared, progress, errors, devices, fifo_lock -queue_lock = threading.Lock() +queue_lock = fifo_lock.FIFOLock() def wrap_queued_call(func): diff --git a/modules/fifo_lock.py b/modules/fifo_lock.py new file mode 100644 index 00000000..c35b3ae2 --- /dev/null +++ b/modules/fifo_lock.py @@ -0,0 +1,37 @@ +import threading +import collections + + +# reference: https://gist.github.com/vitaliyp/6d54dd76ca2c3cdfc1149d33007dc34a +class FIFOLock(object): + def __init__(self): + self._lock = threading.Lock() + self._inner_lock = threading.Lock() + self._pending_threads = collections.deque() + + def acquire(self, blocking=True): + with self._inner_lock: + lock_acquired = self._lock.acquire(False) + if lock_acquired: + return True + elif not blocking: + return False + + release_event = threading.Event() + self._pending_threads.append(release_event) + + release_event.wait() + return self._lock.acquire() + + def release(self): + with self._inner_lock: + if self._pending_threads: + release_event = self._pending_threads.popleft() + release_event.set() + + self._lock.release() + + __enter__ = acquire + + def __exit__(self, t, v, tb): + self.release() diff --git a/modules/progress.py b/modules/progress.py index e32b59dd..a25a0113 100644 --- a/modules/progress.py +++ b/modules/progress.py @@ -72,7 +72,12 @@ def progressapi(req: ProgressRequest): completed = req.id_task in finished_tasks if not active: - return ProgressResponse(active=active, queued=queued, completed=completed, id_live_preview=-1, textinfo="In queue..." if queued else "Waiting...") + textinfo = "Waiting..." + if queued: + sorted_queued = sorted(pending_tasks.keys(), key=lambda x: pending_tasks[x]) + queue_index = sorted_queued.index(req.id_task) + textinfo = "In queue: {}/{}".format(queue_index + 1, len(sorted_queued)) + return ProgressResponse(active=active, queued=queued, completed=completed, id_live_preview=-1, textinfo=textinfo) progress = 0 -- cgit v1.2.3 From a459075d26eecc38d6d58116e38f453450191460 Mon Sep 17 00:00:00 2001 From: AUTOMATIC1111 <16777216c@gmail.com> Date: Tue, 22 Aug 2023 10:41:10 +0300 Subject: actual solution to the uncommon hanging problem that is seemingly caused by multiple progress requests working on same tensor --- modules/progress.py | 45 +++++++++++++++++++++---------------------- modules/sd_samplers_common.py | 2 +- modules/shared_state.py | 2 +- 3 files changed, 24 insertions(+), 25 deletions(-) (limited to 'modules/progress.py') diff --git a/modules/progress.py b/modules/progress.py index a25a0113..69921de7 100644 --- a/modules/progress.py +++ b/modules/progress.py @@ -95,31 +95,30 @@ def progressapi(req: ProgressRequest): predicted_duration = elapsed_since_start / progress if progress > 0 else None eta = predicted_duration - elapsed_since_start if predicted_duration is not None else None + live_preview = None id_live_preview = req.id_live_preview - shared.state.set_current_image() - if opts.live_previews_enable and req.live_preview and shared.state.id_live_preview != req.id_live_preview: - image = shared.state.current_image - if image is not None: - buffered = io.BytesIO() - - if opts.live_previews_image_format == "png": - # using optimize for large images takes an enormous amount of time - if max(*image.size) <= 256: - save_kwargs = {"optimize": True} + + if opts.live_previews_enable and req.live_preview: + shared.state.set_current_image() + if shared.state.id_live_preview != req.id_live_preview: + image = shared.state.current_image + if image is not None: + buffered = io.BytesIO() + + if opts.live_previews_image_format == "png": + # using optimize for large images takes an enormous amount of time + if max(*image.size) <= 256: + save_kwargs = {"optimize": True} + else: + save_kwargs = {"optimize": False, "compress_level": 1} + else: - save_kwargs = {"optimize": False, "compress_level": 1} - - else: - save_kwargs = {} - - image.save(buffered, format=opts.live_previews_image_format, **save_kwargs) - base64_image = base64.b64encode(buffered.getvalue()).decode('ascii') - live_preview = f"data:image/{opts.live_previews_image_format};base64,{base64_image}" - id_live_preview = shared.state.id_live_preview - else: - live_preview = None - else: - live_preview = None + save_kwargs = {} + + image.save(buffered, format=opts.live_previews_image_format, **save_kwargs) + base64_image = base64.b64encode(buffered.getvalue()).decode('ascii') + live_preview = f"data:image/{opts.live_previews_image_format};base64,{base64_image}" + id_live_preview = shared.state.id_live_preview return ProgressResponse(active=active, queued=queued, completed=completed, progress=progress, eta=eta, live_preview=live_preview, id_live_preview=id_live_preview, textinfo=shared.state.textinfo) diff --git a/modules/sd_samplers_common.py b/modules/sd_samplers_common.py index 64845ea4..60fa161c 100644 --- a/modules/sd_samplers_common.py +++ b/modules/sd_samplers_common.py @@ -111,7 +111,7 @@ def images_tensor_to_samples(image, approximation=None, model=None): def store_latent(decoded): - state.current_latent = decoded.clone() + state.current_latent = decoded if opts.live_previews_enable and opts.show_progress_every_n_steps > 0 and shared.state.sampling_step % opts.show_progress_every_n_steps == 0: if not shared.parallel_processing_allowed: diff --git a/modules/shared_state.py b/modules/shared_state.py index 3dc9c788..d272ee5b 100644 --- a/modules/shared_state.py +++ b/modules/shared_state.py @@ -128,7 +128,7 @@ class State: devices.torch_gc() def set_current_image(self): - """sets self.current_image from self.current_latent if enough sampling steps have been made after the last call to this""" + """if enough sampling steps have been made after the last call to this, sets self.current_image from self.current_latent, and modifies self.id_live_preview accordingly""" if not shared.parallel_processing_allowed: return -- cgit v1.2.3