dv-flow-mgr 1.0.0.14420805951a1__py3-none-any.whl → 1.0.0.14458222178a1__py3-none-any.whl

dv_flow/mgr/task_graph_builder.py

@@ -235,7 +235,7 @@ class TaskGraphBuilder(object):
             else:
                 raise Exception("Task %s parameters do not include %s" % (task.name, k))
 
-        self._log.debug("<-- mkTaskNode: %s" % task_t)
+        self._log.debug("<-- mkTaskNode: %s (%d needs)" % (task_t, len(ret.needs)))
         return ret
     
     def _findTask(self, pkg, name):
@@ -386,13 +386,14 @@ class TaskGraphBuilder(object):
         node.input.rundir = self.get_rundir()
         self.leave_rundir()
 
-        self._log.debug("--> processing needs (%s)" % task.name)
+        self._log.debug("--> processing needs (%s) (%d)" % (task.name, len(task.needs)))
         for need in task.needs:
             need_n = self._getTaskNode(need.name)
-            self._log.debug("Add need %s" % need_n.name)
             if need_n is None:
                 raise Exception("Failed to find need %s" % need.name)
+            self._log.debug("Add need %s with %d dependencies" % (need_n.name, len(need_n.needs)))
             node.input.needs.append((need_n, False))
+#            node.needs.append((need_n, False))
         self._log.debug("<-- processing needs")
 
         # TODO: handle strategy
@@ -414,10 +415,13 @@ class TaskGraphBuilder(object):
             self._log.debug("Process node %s" % t.name)
 
             referenced = None
-            for tt in task.subtasks:
-                if tt in t.needs:
-                    referenced = tt
-                    break
+            for tt in node.tasks:
+                self._log.debug("  Checking task %s" % tt.name)
+                for tnn,_ in tt.needs:
+                    self._log.debug("    Check against need %s" % tnn.name)
+                    if tn == tnn:
+                        referenced = tnn
+                        break
 
             refs_internal = None
             # Assess how this task is connected to others in the compound node
@@ -439,12 +443,12 @@ class TaskGraphBuilder(object):
                 self._log.debug("Node %s references internal node %s" % (t.name, refs_internal.name))
 
             if referenced is not None:
+                self._log.debug("Node %s has internal needs: %s" % (tn.name, referenced.name))
+            else:
                 # Add this task as a dependency of the output
                 # node (the root one)
                 self._log.debug("Add node %s as a top-level dependency" % tn.name)
                 node.needs.append((tn, False))
-            else:
-                self._log.debug("Node %s has internal needs" % tn.name)
 
         if task.rundir == RundirE.Unique:
             self.leave_rundir()
@@ -452,7 +456,7 @@ class TaskGraphBuilder(object):
         return node
 
     def _gatherNeeds(self, task_t, node):
-        self._log.debug("--> _gatherNeeds %s" % task_t.name)
+        self._log.debug("--> _gatherNeeds %s (%d)" % (task_t.name, len(task_t.needs)))
         if task_t.uses is not None:
             self._gatherNeeds(task_t.uses, node)
 
@@ -461,7 +465,7 @@ class TaskGraphBuilder(object):
             if need_n is None:
                 raise Exception("Failed to find need %s" % need.name)
             node.needs.append((need_n, False))
-        self._log.debug("<-- _gatherNeeds %s" % task_t.name)
+        self._log.debug("<-- _gatherNeeds %s (%d)" % (task_t.name, len(node.needs)))
         
     def error(self, msg, loc=None):
         if loc is not None:

dv_flow/mgr/task_node_compound.py

@@ -21,7 +21,7 @@
 #****************************************************************************
 import dataclasses as dc
 from pydantic import BaseModel
-from .task_def import ConsumesE
+from .task_def import ConsumesE, PassthroughE, PassthroughE, PassthroughE, PassthroughE
 from .task_node import TaskNode
 from .task_node_leaf import TaskNodeLeaf
 from .task_data import TaskDataResult, TaskDataInput, TaskDataOutput
@@ -44,7 +44,9 @@ class TaskNodeCompound(TaskNode):
         self.input = TaskNodeLeaf(
             name=self.name + ".in",
             srcdir=self.srcdir,
-            params=NullParams())
+            params=NullParams(),
+            consumes=ConsumesE.No,
+            passthrough=PassthroughE.All)
         self.input.task = null_run
         self.tasks.append(self.input)
 
@@ -55,7 +57,7 @@ class TaskNodeCompound(TaskNode):
         return self.input
     
     async def do_run(self, 
-                     runner : TaskRunner, 
+                     ctxt : TaskRunner, 
                      rundir, 
                      memento : Any=None) -> TaskDataResult:
         self._log.debug("Compound task %s (%d)" % (self.name, len(self.needs)))
@@ -90,6 +92,9 @@ class TaskNodeCompound(TaskNode):
             changed=changed,
             output=output,
             dep_m={})
+        
+#        if self.save_exec_data:
+#            self._save_exec_data(rundir, ctxt, self.input.input)
 
         return 0
 

{dv_flow_mgr-1.0.0.14420805951a1.dist-info → dv_flow_mgr-1.0.0.14458222178a1.dist-info}/METADATA

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

@@ -31,11 +31,11 @@ dv_flow/mgr/srcinfo.py,sha256=xrfp-relVr7hYNbxOjY5jqX4H0nNMm9HK5AAM6_Piyk,366
 dv_flow/mgr/task.py,sha256=Xe1sCCTN4yJwhB2Aw_rywdlmVPY2CDnuwZisULuOXhw,2036
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
 dv_flow/mgr/task_def.py,sha256=VAjkFay7KxXfZoloZfbiPr6WhURztV2Dxm6-REMQweo,4912
-dv_flow/mgr/task_graph_builder.py,sha256=dFyC4L4D6v4dnybfbeIAVhyG-W9l4J3STcU75d3A1bM,17059
+dv_flow/mgr/task_graph_builder.py,sha256=UcmDw7Wn8hYbUOFBeWHHrT2ahTzmxQsRU2xRGswfBf0,17460
 dv_flow/mgr/task_graph_dot_writer.py,sha256=fZlNR-ZUFsI5FpH1KFCWJcSpyLSKUh8IhHO9Eavc60c,4925
 dv_flow/mgr/task_listener_log.py,sha256=QH7hAVO1agYJoOx16XqjWv1c-jk5zb6p6A-hic7OMU0,4150
 dv_flow/mgr/task_node.py,sha256=hPlCcped3nCNgOYj4oysVcxu4cHOIUCBUqAevOr20Lc,5086
-dv_flow/mgr/task_node_compound.py,sha256=kmhfcHeqNwYE-XIRh8dsdU_zvLpAzHwVTdr4S3eAtN8,3080
+dv_flow/mgr/task_node_compound.py,sha256=6BGcEiFQ69XL2cW9bwvp42Gd2Z3MRRriopo4BtwGccw,3319
 dv_flow/mgr/task_node_ctor.py,sha256=YsoVMX5WbpbzcHvEK7ps_ZRV-J7MZ3F8NNozQw7vbog,4418
 dv_flow/mgr/task_node_ctor_compound.py,sha256=290JdcTnL3b3Gv7s_wRLjdM02ezKhc9QnxZE0mv72i8,4379
 dv_flow/mgr/task_node_ctor_compound_proxy.py,sha256=D8x54nD8Pd-2-_mr1syhqVeSFfIVf100ldi3bdzmSfI,2073
@@ -66,9 +66,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=cBNt3JJ0PGLlUQFTtBLi12i2j_9gNgSBtKdwS3VfF5Y,1566
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=IJzZdxCSEgIQ79LpYiM7UqJ9RJ-7yraqmBN2XVgAgXA,1752
-dv_flow_mgr-1.0.0.14420805951a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.0.0.14420805951a1.dist-info/METADATA,sha256=6nR-XRqIxfeAWGiU_oChpiwxuot00gCqe8EWvIpotrg,13336
-dv_flow_mgr-1.0.0.14420805951a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-1.0.0.14420805951a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.0.0.14420805951a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.0.0.14420805951a1.dist-info/RECORD,,
+dv_flow_mgr-1.0.0.14458222178a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.0.0.14458222178a1.dist-info/METADATA,sha256=zJngrS-fip7f5zN5bkOJRX56xdGx7ygjBAvw3DmoQ2s,13336
+dv_flow_mgr-1.0.0.14458222178a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-1.0.0.14458222178a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.0.0.14458222178a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.0.0.14458222178a1.dist-info/RECORD,,