dv-flow-mgr 0.0.1.14116344455a1__py3-none-any.whl → 0.0.1.14139694132a1__py3-none-any.whl

dv_flow/mgr/task_node_ctor_def_base.py

@@ -28,9 +28,6 @@ import logging
 import toposort
 from typing import Any, Callable, ClassVar, Dict, List, Tuple
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
-from .task_params_ctor import TaskParamsCtor
-from .param_ref_eval import ParamRefEval
-from .param import Param
 from .task_node_ctor import TaskNodeCtor
 
 @dc.dataclass

dv_flow/mgr/task_node_ctor_proxy.py

@@ -28,9 +28,6 @@ import logging
 import toposort
 from typing import Any, Callable, ClassVar, Dict, List, Tuple
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
-from .task_params_ctor import TaskParamsCtor
-from .param_ref_eval import ParamRefEval
-from .param import Param
 from .task_node import TaskNode
 from .task_node_ctor import TaskNodeCtor
 from .task_node_ctor_def_base import TaskNodeCtorDefBase

dv_flow/mgr/task_node_ctor_task.py

@@ -28,12 +28,8 @@ import logging
 import toposort
 from typing import Any, Callable, ClassVar, Dict, List, Tuple
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
-from .task_params_ctor import TaskParamsCtor
-from .param_ref_eval import ParamRefEval
-from .param import Param
 from .task_node import TaskNode
 from .task_node_leaf import TaskNodeLeaf
-from .task_node_ctor import TaskNodeCtor
 from .task_node_ctor_def_base import TaskNodeCtorDefBase
 
 @dc.dataclass

dv_flow/mgr/task_node_ctor_wrapper.py

@@ -28,13 +28,10 @@ import logging
 import toposort
 from typing import Any, Callable, ClassVar, Dict, List, Tuple
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
-from .task_params_ctor import TaskParamsCtor
-from .param_ref_eval import ParamRefEval
 from .param import Param
 from .task_node import TaskNode
 from .task_node_leaf import TaskNodeLeaf
 from .task_node_ctor import TaskNodeCtor
-from .task_node_ctor_def_base import TaskNodeCtorDefBase
 
 @dc.dataclass
 class TaskNodeCtorWrapper(TaskNodeCtor):

dv_flow/mgr/task_node_leaf.py

@@ -9,7 +9,6 @@ from typing import Any, Callable, ClassVar, Dict, List, Tuple
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
 from .task_def import ConsumesE, PassthroughE
 from .task_node import TaskNode
-from .task_params_ctor import TaskParamsCtor
 from .param_ref_eval import ParamRefEval
 from .param import Param
 

dv_flow/mgr/task_runner.py

@@ -117,20 +117,7 @@ class TaskSetRunner(TaskRunner):
                 while len(active_task_l) >= self.nproc and t not in done_task_s:
                     # Wait for at least one job to complete
                     done, pending = await asyncio.wait(at[1] for at in active_task_l)
-                    for d in done:
-                        for i in range(len(active_task_l)):
-                            if active_task_l[i][1] == d:
-                                tt = active_task_l[i][0]
-                                tt.end = datetime.now()
-                                if tt.result.memento is not None:
-                                    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
+                    self._completeTasks(active_task_l, done_task_s, done, dst_memento)
 
                 if self.status == 0 and t not in done_task_s:
                     memento = src_memento.get(t.name, None)
@@ -162,19 +149,10 @@ class TaskSetRunner(TaskRunner):
                
             # All pending tasks in the task-group have been launched
             # Wait for them to all complete
-            if len(active_task_l):
+            while len(active_task_l):
                 # TODO: Shouldn't gather here -- reach to each completion
-                coros = list(at[1] for at in active_task_l)
-                res = await asyncio.gather(*coros)
-                for tt in active_task_l:
-                    tt[0].end = datetime.now()
-                    if tt[0].result.memento is not None:
-                        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()
+                done, pending = await asyncio.wait(at[1] for at in active_task_l)
+                self._completeTasks(active_task_l, done_task_s, done, dst_memento)
             
             if self.status != 0:
                 self._log.debug("Exiting due to status: %d", self.status)
@@ -196,6 +174,23 @@ class TaskSetRunner(TaskRunner):
         else:
             return None
         
+    def _completeTasks(self, active_task_l, done_task_s, done_l, dst_memento):
+        for d in done_l:
+            for i in range(len(active_task_l)):
+                if active_task_l[i][1] == d:
+                    tt = active_task_l[i][0]
+                    tt.end = datetime.now()
+                    if tt.result.memento is not None:
+                        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
+        pass
+        
     def buildDepMap(self, task : Union[TaskNode, List[TaskNode]]) -> Dict[TaskNode, Set[TaskNode]]:
         tasks = task if isinstance(task, list) else [task]
         dep_m = {}

{dv_flow_mgr-0.0.1.14116344455a1.dist-info → dv_flow_mgr-0.0.1.14139694132a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.1.14116344455a1
+Version: 0.0.1.14139694132a1
 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.14116344455a1.dist-info → dv_flow_mgr-0.0.1.14139694132a1.dist-info}/RECORD

@@ -24,14 +24,14 @@ dv_flow/mgr/task_node_compound.py,sha256=y8_jzsfT9Vnm-tCWc_-hFHFoSat95zBXFibySu3
 dv_flow/mgr/task_node_ctor.py,sha256=COFGvm5PR2B92H3uW1yhDIUCmppo9U4IfOcv_Jrsreo,3952
 dv_flow/mgr/task_node_ctor_compound.py,sha256=inJeqOtlkVa7QRCzktqvVkkZ0vZALHFadIGlRZyDTD8,4006
 dv_flow/mgr/task_node_ctor_compound_proxy.py,sha256=fkH_b35xE0dABbRn9Boa80WWx_tR4L9v1mhX6faefpg,1999
-dv_flow/mgr/task_node_ctor_def_base.py,sha256=C2EeKgjeHB9xdC7nkLMBOcektwDoLhdP-4wQLY8OZ4g,1562
-dv_flow/mgr/task_node_ctor_proxy.py,sha256=e1pfLBnJHAgQvkyNcB8sKw5DJdAPRphQz1-DT9Oheho,2017
-dv_flow/mgr/task_node_ctor_task.py,sha256=9HT39F3KcEpnOBd0SbUqE6FaeSY5fFp_tN1bzGNfFKk,2237
-dv_flow/mgr/task_node_ctor_wrapper.py,sha256=fRwO2RRJbt7IB1Ziwobmg0-nU5vFYsXoNV4IXfsS7mw,3435
-dv_flow/mgr/task_node_leaf.py,sha256=YofovCK8ozKOXyAAnoRq9fKcNh2kGGWxsQXh6l9K8t0,7276
+dv_flow/mgr/task_node_ctor_def_base.py,sha256=KEOU0uRL8VxbANyOc7X5dUMERAtlqUAGI-pMPfbuHlU,1451
+dv_flow/mgr/task_node_ctor_proxy.py,sha256=ViOFJ64JM4-CGFZNl89BghFuKSQ66kZVqSj4v2PA6VA,1906
+dv_flow/mgr/task_node_ctor_task.py,sha256=qpgqMgQ-Nx4F2hAWfp08zPU43TbWs9rv0GnFuD84G6M,2085
+dv_flow/mgr/task_node_ctor_wrapper.py,sha256=El09jWz6aAq08sy2ZPgr93LwtCi2Zyt1Ykh-Shd0Cho,3292
+dv_flow/mgr/task_node_leaf.py,sha256=t1aP26CPCO89XSA_5AonvNFQhsgjJsq62lxY3TFyUMI,7231
 dv_flow/mgr/task_output.py,sha256=ZwyvwnYj_gHOEFAEOH3m24Xfc4Cn77hb1j7LkX8_3C4,1086
 dv_flow/mgr/task_params_ctor.py,sha256=BPkbnoCtzhCxc1g8CJ6VimCcm5UAu92PXeDMhQ4lYsQ,1957
-dv_flow/mgr/task_runner.py,sha256=Ho-u4xhiTVrOhSgjtcv-6pA0euwI3JFNNAHRdmSVBaA,9477
+dv_flow/mgr/task_runner.py,sha256=mEFf0Mh5XYHkmB52UQI1gT9ugH9oISEb59Ce8EezZaI,9104
 dv_flow/mgr/type.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/type_def.py,sha256=NDeyplKrPnWwEv4yHkhXEMK9d9j39b5MOeLB-1Mchqo,1095
 dv_flow/mgr/cmds/cmd_graph.py,sha256=Ykw__EdwamDBZZKxQZVbtMtFl7koq5dJMShTBXSM2pk,2672
@@ -49,9 +49,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=yg9oTPRiO87mkCSOQpOtlG9vyKPQzY3qp4OJkEMbWyY,1443
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=lrEI-Jwb8j4I4yYOn9hq7_7NYbK8leVxLesrHyEWm-E,1879
-dv_flow_mgr-0.0.1.14116344455a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.14116344455a1.dist-info/METADATA,sha256=eCspmsiQjw9KIDGVt0zXfKIQufdktI71Mn-LkQcL6Vc,13336
-dv_flow_mgr-0.0.1.14116344455a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-0.0.1.14116344455a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.14116344455a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.14116344455a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.14139694132a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.14139694132a1.dist-info/METADATA,sha256=p0Qw8i67Jgu_NdhXRRZD_6xzpMtrELAJp4GE6Tuumjs,13336
+dv_flow_mgr-0.0.1.14139694132a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-0.0.1.14139694132a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.14139694132a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.14139694132a1.dist-info/RECORD,,