dedebenui/scgenerator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small pbar fix

Browse Source
This commit is contained in:
dedebenui
2024-02-16 10:17:35 +01:00
parent a0d597723c
commit afe348ebb9
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/scgenerator/threading.py
View File

@@ -1,7 +1,6 @@
from __future__ import annotations from __future__ import annotations
import multiprocessing import multiprocessing
import sys
from collections.abc import Iterable, Iterator from collections.abc import Iterable, Iterator
from dataclasses import dataclass from dataclasses import dataclass
from enum import Enum, auto from enum import Enum, auto
@@ -107,12 +106,8 @@ class PositionGetter:
self.offset = offset self.offset = offset
self.busy_at = [False for _ in range(n)] self.busy_at = [False for _ in range(n)]
@property
def max_pos(self) -> int:
return max(self.busy_at)
def book(self) -> int: def book(self) -> int:
for pos, busy in enumerate(self.busy_at[: self.remaining]): for pos, busy in enumerate(self.busy_at):
if not busy: if not busy:
self.busy_at[pos] = True self.busy_at[pos] = True
self.remaining -= 1 self.remaining -= 1
@@ -129,7 +124,7 @@ class MultibarThread(Thread):
def __init__( def __init__(
self, self,
n_bars: int, n_tasks: int,
n_show: int, n_show: int,
queue: Queue, queue: Queue,
default_total: int | float | None = None, default_total: int | float | None = None,
@@ -138,9 +133,9 @@ class MultibarThread(Thread):
super().__init__() super().__init__()
self.queue = queue self.queue = queue
pos_getter = PositionGetter(n_bars, n_show, offset=1) pos_getter = PositionGetter(n_tasks, n_show, offset=1)
self.sub_pbars = [DelayedTqdm(pos_getter, total=default_total) for _ in range(n_bars)] self.sub_pbars = [DelayedTqdm(pos_getter, total=default_total) for _ in range(n_tasks)]
self.main_pbar = tqdm( self.main_pbar = tqdm(
total=sum((bar.total or 0) for bar in self.sub_pbars), total=sum((bar.total or 0) for bar in self.sub_pbars),
position=0, position=0,