experimaestro 1.5.8__py3-none-any.whl → 1.5.10__py3-none-any.whl

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")

experimaestro/scheduler/base.py

@@ -889,7 +889,7 @@ class experiment:
         """Shortcut to set the environment value"""
         if override or name not in self.workspace.env:
             logging.info("Setting environment: %s=%s", name, value)
-            self.worskpace.env[name] = value
+            self.workspace.env[name] = value
 
     def token(self, name: str, count: int):
         """Returns a token for this experiment

{experimaestro-1.5.8.dist-info → experimaestro-1.5.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: experimaestro
-Version: 1.5.8
+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.8.dist-info → experimaestro-1.5.10.dist-info}/RECORD

@@ -4,7 +4,7 @@ experimaestro/annotations.py,sha256=dcpFmo01T12S_y5nIBIQjiXsGsq5S80ZB-58o8tW9wA,
 experimaestro/checkers.py,sha256=ZCMbnE_GFC5compWjt-fuHhPImi9fCPjImF8Ow9NqK8,696
 experimaestro/cli/__init__.py,sha256=mzc-qqTFtZnFwCQl7IiwlYXEx08kLGwdntWayCerZ6E,9610
 experimaestro/cli/filter.py,sha256=0jJrD_2cWydovjLO32vTFTK-TxXSs9P8Zxp5WaBF5AE,5790
-experimaestro/cli/jobs.py,sha256=eWDZ2ObdySshDujFQdkmChxD9TS53270ckTXggGFXQc,7630
+experimaestro/cli/jobs.py,sha256=3cXo9-qNgtVG0ct5Kod082iXu2snczQsMss-AQvJjV0,7769
 experimaestro/click.py,sha256=6BkeQHEgcxaxzq3xEvEEzwzuBj5-dkfrpOGikuA8L00,1377
 experimaestro/commandline.py,sha256=NS1ubme8DTJtDS2uWwdHLQiZsl6TSK1LkNxu39c3-cw,9463
 experimaestro/compat.py,sha256=dQqE2ZNHLM2wtdfp7fBRYMfC33qNehVf9J6FGRBUQhs,171
@@ -49,7 +49,7 @@ experimaestro/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 experimaestro/rpyc.py,sha256=ZRKol-3tVoeoUITLNFenLF4dhWBLW_FvSV_GvsypmeI,3605
 experimaestro/run.py,sha256=NTFORDb_RlEK6tWKa7K-_2_bGCdHzzjBJVH5C1ReYtw,5222
 experimaestro/scheduler/__init__.py,sha256=ERmmOxz_9mUkIuccNbzUa5Y6gVLLVDdyc4cCxbCCUbY,20
-experimaestro/scheduler/base.py,sha256=jXjep3VS5cRCjCj6vCxp4t1fGVyqQW2JQNnLp6HKmLQ,31941
+experimaestro/scheduler/base.py,sha256=XGq8kokNycba5D-KYKrNZ3WcXWKDUxusTkgR-X9S0E0,31941
 experimaestro/scheduler/dependencies.py,sha256=n9XegwrmjayOIxt3xhuTEBVEBGSq4oeVdzz-FviDGXo,1994
 experimaestro/scheduler/services.py,sha256=aCKkNZMULlceabqf-kOs_-C7KPINnjU3Q-I00o5x6iY,2189
 experimaestro/scheduler/workspace.py,sha256=vyVbYZML28zvmgxfWc2PsKKHGlrAejY43UYlttbm9AU,2280
@@ -139,8 +139,8 @@ experimaestro/utils/jupyter.py,sha256=JcEo2yQK7x3Cr1tNl5FqGMZOICxCv9DwMvL5xsWdQP
 experimaestro/utils/resources.py,sha256=MaCQL9dLfze3lwyuBVeWF7Ki5fFSE1F0BGWrfaaHi1I,1135
 experimaestro/utils/settings.py,sha256=jpFMqF0DLL4_P1xGal0zVR5cOrdD8O0Y2IOYvnRgN3k,793
 experimaestro/xpmutils.py,sha256=S21eMbDYsHfvmZ1HmKpq5Pz5O-1HnCLYxKbyTBbASyQ,638
-experimaestro-1.5.8.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-experimaestro-1.5.8.dist-info/METADATA,sha256=kPnVB4v19GLGlmLoehU2S78yQrpanMrB2QFaTlxuonw,6265
-experimaestro-1.5.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-experimaestro-1.5.8.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
-experimaestro-1.5.8.dist-info/RECORD,,
+experimaestro-1.5.10.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+experimaestro-1.5.10.dist-info/METADATA,sha256=98TsVdWS-8gKbvEs29VSbqDjboe3FiI-ohOc58Y68n0,6266
+experimaestro-1.5.10.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+experimaestro-1.5.10.dist-info/entry_points.txt,sha256=TppTNiz5qm5xm1fhAcdLKdCLMrlL-eQggtCrCI00D9c,446
+experimaestro-1.5.10.dist-info/RECORD,,