dv-flow-mgr 0.0.1.13755459426a1__py3-none-any.whl → 0.0.1.13777907248a1__py3-none-any.whl

dv_flow/mgr/__main__.py

@@ -56,7 +56,7 @@ def main():
         }
         logging.basicConfig(level=opt_m[args.log_level])
 
-    args.func(args)
+    return args.func(args)
 
 if __name__ == "__main__":
     main()

dv_flow/mgr/cmds/cmd_run.py

@@ -76,4 +76,6 @@ class CmdRun(object):
 
         asyncio.run(runner.run(tasks))
 
+        return runner.status
+
 

dv_flow/mgr/pkg_rgy.py

@@ -89,6 +89,7 @@ class PkgRgy(object):
         self._log.debug("<-- registerPackage %s" % pkg_def.name)
 
     def _discover_plugins(self):
+        self._log.debug("--> discover_plugins")
         # Register built-in package
         self._pkg_m["std"] = (os.path.join(os.path.dirname(__file__), "std/flow.dv"), None)
 
@@ -102,6 +103,7 @@ class PkgRgy(object):
             from importlib.metadata import entry_points
 
         discovered_plugins = entry_points(group='dv_flow.mgr')
+        self._log.debug("discovered_plugins: %s" % str(discovered_plugins))
         for p in discovered_plugins:
             try:
                 mod = p.load()
@@ -110,6 +112,7 @@ class PkgRgy(object):
                     pkg_m = mod.dvfm_packages()
                     
                     for name,path in pkg_m.items():
+                        self._log.debug("Registering package %s: %s" % (name, path))
                         if name in self._pkg_m.keys():
                             raise Exception("Package %s already registered using path %s. Conflicting path: %s" % (
                                 name, self._pkg_m[name][0], path))
@@ -121,6 +124,7 @@ class PkgRgy(object):
         # self._pkgs = {}
         # for pkg in self._load_pkg_list():
         #     self._pkgs[pkg.name] = pkg
+        self._log.debug("<-- discover_plugins")
 
     def copy(self):
         ret = PkgRgy()

dv_flow/mgr/std/fileset.py

@@ -43,6 +43,8 @@ async def FileSet(runner, input) -> TaskDataResult:
 
         _log.debug("glob_root: %s" % glob_root)
 
+        # TODO: throw error if 'type' is not set
+
         fs = _FileSet(
                 filetype=input.params.type,
                 src=input.name, 

dv_flow/mgr/task_runner.py

@@ -38,6 +38,7 @@ class TaskRunner(object):
 @dc.dataclass
 class TaskSetRunner(TaskRunner):
     nproc : int = 8
+    status : int = 0
 
     _anon_tid : int = 1
 
@@ -87,6 +88,7 @@ class TaskSetRunner(TaskRunner):
 
         active_task_l = []
         done_task_s = set()
+        self.status = 0
         for active_s in order:
             done = True
             for t in active_s:
@@ -101,11 +103,13 @@ class TaskSetRunner(TaskRunner):
                                     dst_memento[tt.name] = tt.result.memento.model_dump()
                                 else:
                                     dst_memento[tt.name] = None
+                                self.status |= tt.result.status 
                                 self._notify(tt, "leave")
                                 done_task_s.add(tt)
                                 active_task_l.pop(i)
                                 break
-                if t not in done_task_s:
+
+                if self.status == 0 and t not in done_task_s:
                     memento = src_memento.get(t.name, None)
                     dirname = t.name
                     invalid_chars_pattern = r'[\/:*?"<>|#%&{}\$\\!\'`;=@+]'
@@ -123,8 +127,13 @@ class TaskSetRunner(TaskRunner):
                         rundir,
                         memento)) 
                     active_task_l.append((t, coro))
+
+                if self.status != 0:
+                    self._log.debug("Exiting due to status: %d", self.status)
+                    break
                
-            # Now, wait for tasks to complete
+            # All pending tasks in the task-group have been launched
+            # Wait for them to all complete
             if len(active_task_l):
                 # TODO: Shouldn't gather here -- reach to each completion
                 coros = list(at[1] for at in active_task_l)
@@ -134,8 +143,13 @@ class TaskSetRunner(TaskRunner):
                         dst_memento[tt[0].name] = tt[0].result.memento.model_dump()
                     else:
                         dst_memento[tt[0].name] = None
+                    self.status |= tt[0].result.status
                     self._notify(tt[0], "leave")
                 active_task_l.clear()
+            
+            if self.status != 0:
+                self._log.debug("Exiting due to status: %d", self.status)
+                break
 
         with open(os.path.join(self.rundir, "cache", "mementos.json"), "w") as f:
             json.dump(dst_memento, f)
@@ -145,10 +159,6 @@ class TaskSetRunner(TaskRunner):
         else:
             return task.output
 
-
-
-        pass
-
     def _buildDepMap(self, dep_m, task : TaskNode):
         if task.name is None:
             task.name = "anon_%d" % self._anon_tid

{dv_flow_mgr-0.0.1.13755459426a1.dist-info → dv_flow_mgr-0.0.1.13777907248a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13755459426a1
+Version: 0.0.1.13777907248a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License

{dv_flow_mgr-0.0.1.13755459426a1.dist-info → dv_flow_mgr-0.0.1.13777907248a1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dv_flow/mgr/__init__.py,sha256=2iTpSe1M8g_u2UlAQFa3XFfqcw8gBOWdBvrstce1c5E,403
-dv_flow/mgr/__main__.py,sha256=PAuvUsmTjxx62e2H8kCuZWD1GDcfBL5k78IGLeRHz_o,2201
+dv_flow/mgr/__main__.py,sha256=shnmbpIsD98HA1a12boQtpzunhi2atAD1T1hNJwS1Lw,2208
 dv_flow/mgr/eval_jq.py,sha256=Ue-qkyNW6uOu2Wy8u6nrTbPPY7ujaHd0-4iki0eV3Ec,294
 dv_flow/mgr/expr_eval.py,sha256=Mp0TvrV6gZWcj1uYwLfPNI-ARwwdAfwntE5byLBfBuY,2276
 dv_flow/mgr/expr_parser.py,sha256=FhBTkKKkJXubGHUzmcMWubPfPklYLGzVz1jK4-dYb44,5702
@@ -13,7 +13,7 @@ dv_flow/mgr/param.py,sha256=3BY-ucig6JRw73FhjyJQL-vpd57qhAzixgZ8I5FoUpw,553
 dv_flow/mgr/param_def.py,sha256=gLua-EQiY8V2CFX-2svLRIlrs8PEeGh4-EPtn4a2Mng,712
 dv_flow/mgr/param_ref_eval.py,sha256=U8QhDf1n_9bLnExdc1oQamq5-pOUXrFalOX4oyR9UoM,1138
 dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
-dv_flow/mgr/pkg_rgy.py,sha256=sCMNBTEWAAz1a0AnyeFm097RiVdjmo1yFRqdgC3TA-U,4890
+dv_flow/mgr/pkg_rgy.py,sha256=46XMWint3JpP2nx-OYTpzpHZgOkrvTseUU4Y87KusC8,5147
 dv_flow/mgr/task.py,sha256=kLQSvnVwj9ROIDtxq8lLu-4mJizTxOqvUeogmgN6QAA,5976
 dv_flow/mgr/task_ctor.py,sha256=hlfl-UVvyjzLFN6D0Oel9eBs0xUQPqCX7gQ0uEHoL7o,1382
 dv_flow/mgr/task_data.py,sha256=F0X-e0IHTh06Z0F67TWIUPKuJYf6JPzZyMPrDzOJvK0,11409
@@ -28,20 +28,20 @@ dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1
 dv_flow/mgr/task_node.py,sha256=K65jWd2GYZH1oYlfkc5sx0eGzDbWdElA5EQXCremH-Y,12651
 dv_flow/mgr/task_output.py,sha256=dkJhhNRFGFQSkVsw_bGirK0_0ghTxBYq1LjRMZCVWnA,245
 dv_flow/mgr/task_params_ctor.py,sha256=aXgB8o9xFPjaEjGW_xYkEC0N0apzGzGUPDj7g2ZLvus,1112
-dv_flow/mgr/task_runner.py,sha256=oIBUs9UWLVb2E1UqKvmWV3ZSeegM8-FTR5EukIO27xk,7099
+dv_flow/mgr/task_runner.py,sha256=tWderVo2MqCgPC0A-HcrVQuAZ9Xx77EmJ0i3e-bmPfo,7621
 dv_flow/mgr/type.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/type_def.py,sha256=KdhuNlfw-NKU-4VZFCnMPyj775yEB7cpr5tz73a9yuQ,259
 dv_flow/mgr/util.py,sha256=06eVyURF4ga-s8C9Sd3ZSDebwO4QS0XXaB8xADVbWRc,1437
-dv_flow/mgr/cmds/cmd_run.py,sha256=yMldH1ANcNcrLk9FIOo5z58FvwFfWA-Ys74NHWTAQvg,2437
+dv_flow/mgr/cmds/cmd_run.py,sha256=w1KdnS5Skg4RH1xTB1RZP7gAElZMNcRuOhz3G98n9uk,2467
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/exec.py,sha256=ETx9xSxhdCD_iw6pcmhrafDCJ-41AneyEAPwQf3q-3w,452
-dv_flow/mgr/std/fileset.py,sha256=69cgah6jmRNGmFaLZKpMUaxVSaQ5DxtrqshhQwXhO54,2956
+dv_flow/mgr/std/fileset.py,sha256=AOLARYXjJEmKAextB_4P4eRu2PHNPex961eq16QtgCc,3006
 dv_flow/mgr/std/flow.dv,sha256=DpDTrRBfbIt4cJKLHqk_l6_nPkeFDKLVa5Ic4FZodNM,1587
 dv_flow/mgr/std/message.py,sha256=T8Ye44784rD6CT2qIAP5SD7sKPdAlGMFimc4IaPCxxE,200
 dv_flow/mgr/std/task_null.py,sha256=UKwUnqwFPBY8BO44ZAPcgehQB59kHZFa1qyZc1TwUqE,196
-dv_flow_mgr-0.0.1.13755459426a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13755459426a1.dist-info/METADATA,sha256=Sxstanb7C8gv1vu73TCfvMV7fHxb7JMMWP_KtDWL3XQ,13314
-dv_flow_mgr-0.0.1.13755459426a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-dv_flow_mgr-0.0.1.13755459426a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13755459426a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13755459426a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13777907248a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13777907248a1.dist-info/METADATA,sha256=-CgaG1f2HCBWKcYpeuoibcdw69kD5iSmZdwY3ZQZXk4,13314
+dv_flow_mgr-0.0.1.13777907248a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+dv_flow_mgr-0.0.1.13777907248a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13777907248a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13777907248a1.dist-info/RECORD,,