experimaestro 1.5.9__tar.gz → 1.5.10__tar.gz

{experimaestro-1.5.9 → experimaestro-1.5.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: experimaestro
-Version: 1.5.9
+Version: 1.5.10
 Summary: "Experimaestro is a computer science experiment manager"
 Home-page: https://github.com/experimaestro/experimaestro-python
 License: GPL-3

{experimaestro-1.5.9 → experimaestro-1.5.10}/pyproject.toml

@@ -19,7 +19,7 @@ include = [
     "src/experimaestro/sphinx/static/experimaestro.css",
     "src/experimaestro/mkdocs/style.css"
 ]
-version = "1.5.9"
+version = "1.5.10"
 repository = "https://github.com/experimaestro/experimaestro-python"
 documentation = "https://experimaestro-python.readthedocs.io/"
 
@@ -119,7 +119,7 @@ warn_unused_ignores = true
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "1.5.9"
+version = "1.5.10"
 changelog_start_rev = "0.15.0"
 tag_format = "v$version"
 update_changelog_on_bump = true

{experimaestro-1.5.9 → experimaestro-1.5.10}/src/experimaestro/cli/jobs.py

@@ -50,90 +50,100 @@ def process(
     perform=False,
     fullpath=False,
 ):
-    path = workspace.path
-    for p in (path / "xp").glob("*"):
-        if experiment and p.name != experiment:
-            continue
+    from .filter import createFilter, JobInformation
+    from experimaestro.scheduler import JobState
 
-        from .filter import createFilter, JobInformation
-        from experimaestro.scheduler import JobState
+    _filter = createFilter(filter) if filter else lambda x: True
 
-        _filter = createFilter(filter) if filter else lambda x: True
+    # Get all jobs from experiments
+    job2xp = {}
+
+    path = workspace.path
+    for p in (path / "xp").glob("*"):
+        for job in p.glob("jobs/*/*"):
+            job_path = job.resolve()
+            if job_path.is_dir():
+                *_, scriptname = job_path.parent.name.rsplit(".", 1)
+                job2xp.setdefault(scriptname, set()).add(p.name)
 
-        print(f"* Experiment {p.name}")
         if (p / "jobs.bak").is_dir():
-            cprint("  Experiment has not finished yet", "red")
-            if not perform and (kill or clean):
+            cprint(f"  Experiment {p.name} has not finished yet", "red")
+            if (not perform) and (kill or clean):
                 cprint("  Preventing kill/clean (use --force if you want to)", "yellow")
                 kill = False
                 clean = False
-        print()
 
-        for job in p.glob("jobs/*/*"):
-            info = None
-            p = job.resolve()
-            if p.is_dir():
-                *_, scriptname = p.parent.name.rsplit(".", 1)
-
-                info = JobInformation(p, scriptname)
-                job_path = (
-                    str(job.resolve()) if fullpath else f"{job.parent.name}/{job.name}"
-                )
+    # Now, process jobs
+    for job in path.glob("jobs/*/*"):
+        info = None
+        p = job.resolve()
+        if p.is_dir():
+            *_, scriptname = p.parent.name.rsplit(".", 1)
+            xps = job2xp.get(scriptname, set())
+            if experiment and experiment not in xps:
+                continue
 
-                if filter:
-                    if not _filter(info):
-                        continue
-
-                if info.state is None:
-                    print(colored(f"NODIR   {job_path}", "red"), end="")
-                elif info.state.running():
-                    if kill:
-                        if perform:
-                            process = info.getprocess()
-                            if process is None:
-                                cprint(
-                                    "internal error – no process could be retrieved",
-                                    "red",
-                                )
-                            else:
-                                cprint(f"KILLING {process}", "light_red")
-                                process.kill()
-                        else:
-                            print("KILLING (not performing)", process)
-                    print(
-                        colored(f"{info.state.name:8}{job_path}", "yellow"),
-                        end="",
-                    )
-                elif info.state == JobState.DONE:
-                    print(
-                        colored(f"DONE    {job_path}", "green"),
-                        end="",
-                    )
-                elif info.state == JobState.ERROR:
-                    print(colored(f"FAIL    {job_path}", "red"), end="")
-                else:
-                    print(
-                        colored(f"{info.state.name:8}{job_path}", "red"),
-                        end="",
-                    )
+            info = JobInformation(p, scriptname)
+            job_str = (
+                (str(job.resolve()) if fullpath else f"{job.parent.name}/{job.name}")
+                + " "
+                + ",".join(xps)
+            )
 
-            else:
-                if not ready:
+            if filter:
+                if not _filter(info):
                     continue
-                print(colored(f"READY {job_path}", "yellow"), end="")
 
-            if tags:
-                print(f""" {" ".join(f"{k}={v}" for k, v in info.tags.items())}""")
+            if info.state is None:
+                print(colored(f"NODIR   {job_str}", "red"), end="")
+            elif info.state.running():
+                if kill:
+                    if perform:
+                        process = info.getprocess()
+                        if process is None:
+                            cprint(
+                                "internal error – no process could be retrieved",
+                                "red",
+                            )
+                        else:
+                            cprint(f"KILLING {process}", "light_red")
+                            process.kill()
+                    else:
+                        print("KILLING (not performing)", process)
+                print(
+                    colored(f"{info.state.name:8}{job_str}", "yellow"),
+                    end="",
+                )
+            elif info.state == JobState.DONE:
+                print(
+                    colored(f"DONE    {job_str}", "green"),
+                    end="",
+                )
+            elif info.state == JobState.ERROR:
+                print(colored(f"FAIL    {job_str}", "red"), end="")
+            else:
+                print(
+                    colored(f"{info.state.name:8}{job_str}", "red"),
+                    end="",
+                )
+
+        else:
+            if not ready:
+                continue
+            print(colored(f"READY {job_path}", "yellow"), end="")
+
+        if tags:
+            print(f""" {" ".join(f"{k}={v}" for k, v in info.tags.items())}""")
+        else:
+            print()
+
+        if clean and info.state and info.state.finished():
+            if perform:
+                cprint("Cleaning...", "red")
+                rmtree(p)
             else:
-                print()
-
-            if clean and info.state and info.state.finished():
-                if perform:
-                    cprint("Cleaning...", "red")
-                    rmtree(p)
-                else:
-                    cprint("Cleaning... (not performed)", "red")
-        print()
+                cprint("Cleaning... (not performed)", "red")
+    print()
 
 
 @click.option("--experiment", default=None, help="Restrict to this experiment")