From ab5e7dde9a4a26eafab3f69430fdfdddcec96f91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Sierro?= Date: Mon, 12 Jul 2021 18:15:36 +0200 Subject: [PATCH] pbar have unique id --- src/scgenerator/scripts/__init__.py | 5 +++++ src/scgenerator/utils/__init__.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/scgenerator/scripts/__init__.py b/src/scgenerator/scripts/__init__.py index 047d0ab..dace2e8 100644 --- a/src/scgenerator/scripts/__init__.py +++ b/src/scgenerator/scripts/__init__.py @@ -24,7 +24,12 @@ def fingerprint(params: BareParams): def plot_all(sim_dir: Path, limits: list[str], **opts): + for k, v in opts.items(): + if k in ["skip"]: + opts[k] = int(v) dir_list = list(p for p in sim_dir.glob("*") if p.is_dir()) + if len(dir_list) == 0: + dir_list = [sim_dir] limits = [ tuple(func(el) for func, el in zip([float, float, str], lim.split(","))) for lim in limits ] diff --git a/src/scgenerator/utils/__init__.py b/src/scgenerator/utils/__init__.py index a924156..bbc6c16 100644 --- a/src/scgenerator/utils/__init__.py +++ b/src/scgenerator/utils/__init__.py @@ -17,6 +17,7 @@ from pathlib import Path from typing import Any, Dict, Iterable, Iterator, List, Tuple, TypeVar, Union import numpy as np +import random from tqdm import tqdm @@ -38,6 +39,8 @@ class PBars: worker_kwargs=None, ) -> "PBars": + self.id = random.randint(100000, 999999) + if isinstance(task, abc.Iterable): self.iterator: Iterable[T_] = iter(task) self.num_tot: int = len(task) @@ -63,7 +66,7 @@ class PBars: if "desc" in kwargs: kwargs["desc"] = kwargs["desc"].format(worker_id=i) self.append(tqdm(position=i, ncols=100, ascii=False, **kwargs)) - self.print_path = Path("progress " + self.pbars[0].desc).resolve() + self.print_path = Path(f"progress {self.pbars[0].desc} {self.id}").resolve() self.close_ev = threading.Event() if "file" in self.policy: self.thread = threading.Thread(target=self.print_worker, daemon=True)