dv-flow-mgr 1.0.0.14370893826a1__py3-none-any.whl → 1.0.0.14389547107a1__py3-none-any.whl

dv_flow/mgr/package_loader.py

@@ -605,7 +605,7 @@ class PackageLoader(object):
                 rundir = base_t.rundir
 
         if passthrough is None:
-            passthrough = PassthroughE.No
+            passthrough = PassthroughE.Unused
         if consumes is None:
             consumes = ConsumesE.All
 

dv_flow/mgr/task_graph_builder.py

@@ -215,38 +215,6 @@ class TaskGraphBuilder(object):
 
         # return ret
         
-    def _mkTaskGraph(self, task : str) -> TaskNode:
-        if task in self.root_pkg.task_m.keys():
-            task_t = self.root_pkg.task_m[task]
-        else:
-            pass
-
-        if task_t is None:
-            raise Exception("Failed to find task %s" % task)
-
-        ctor = self._getTaskCtor(task_t)
-
-        params = ctor.mkTaskParams()
-
-        needs = []
-
-        for need in task_t.needs:
-            need_n = self.findTask(need.name)
-            if need_n is None:
-                raise Exception("Failed to find need %s" % need.name)
-            needs.append(need_n)
-
-        task = ctor.mkTaskNode(
-            builder=self,
-            params=params,
-            name=task,
-            needs=needs)
-        task.rundir = self.get_rundir(task.name)
-#        task.rundir = rundir
-        
-        self._task_node_m[task.name] = task
-
-        return task
     
     def mkTaskNode(self, task_t, name=None, srcdir=None, needs=None, **kwargs):
         self._log.debug("--> mkTaskNode: %s" % task_t)
@@ -337,10 +305,7 @@ class TaskGraphBuilder(object):
 
         # Now, link up the needs
         self._log.debug("--> processing needs")
-        for n in task.needs:
-            self._log.debug("-- need %s" % n.name)
-            nn = self._getTaskNode(n.name)
-            node.needs.append((nn, False))
+        self._gatherNeeds(task, node)
         self._log.debug("<-- processing needs")
 
         if task.rundir == RundirE.Unique:
@@ -375,10 +340,7 @@ class TaskGraphBuilder(object):
         self.leave_rundir()
 
         self._log.debug("--> processing needs")
-        for need in task.needs:
-            self._log.debug("-- need: %s" % need.name)
-            nn = self._getTaskNode(need.name)
-            node.input.needs.append((nn, False))
+        self._gatherNeeds(task, node.input)
         self._log.debug("<-- processing needs")
 
         # TODO: handle strategy
@@ -429,6 +391,17 @@ class TaskGraphBuilder(object):
 
         return node
 
+    def _gatherNeeds(self, task_t, node):
+        self._log.debug("--> _gatherNeeds %s" % task_t.name)
+        if task_t.uses is not None:
+            self._gatherNeeds(task_t.uses, node)
+
+        for need in task_t.needs:
+            need_n = self._getTaskNode(need.name)
+            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)
         
     def getTaskCtor(self, spec : Union[str,'TaskSpec'], pkg : PackageDef = None) -> 'TaskNodeCtor':
         from .task_def import TaskSpec

dv_flow/mgr/task_node_leaf.py

@@ -170,7 +170,9 @@ class TaskNodeLeaf(TaskNode):
                 for need,block in self.needs:
                     if not block:
                         output.extend(need.output.output)
-            else:
+            elif self.consumes == ConsumesE.All:
+                self._log.debug("All inputs are consumed, so not propagating any")
+            elif isinstance(self.consumes, list):
                 # Filter out parameter sets that were consumed
                 self._log.debug("Propagating non-consumed input parameters to output")
                 self._log.debug("consumes: %s" % str(self.consumes))

{dv_flow_mgr-1.0.0.14370893826a1.dist-info → dv_flow_mgr-1.0.0.14389547107a1.dist-info}/METADATA

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

@@ -18,7 +18,7 @@ dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=PvOuNfuy-SlaiMDzT5SU48OlPJrhS9vpNCgX06KNyTo,2336
 dv_flow/mgr/package_def.py,sha256=-UyeFb_0Sj16RtS2vxtIxTfl-oW7adJjM1I3ZSjcRpc,5729
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
-dv_flow/mgr/package_loader.py,sha256=LsPAcCKfAiEapC0I3m3Jv6Ra6YsQCXAqJe3_ETE6m_U,25071
+dv_flow/mgr/package_loader.py,sha256=Z80md4ZhJk6TPVlvYAWlnH1aJvATlB9skIyb1pZ1P8U,25075
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=hOBBRLiXJ5DakXkhrLCBAQ9GPlgq-QS52r0aflmIgbg,1832
 dv_flow/mgr/param_ref_eval.py,sha256=5yH37oIX6f2qmk7GfRgNT5qZx0jm3CJFgB9lLDZZ1yQ,1981
@@ -31,7 +31,7 @@ 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=SMGuYXWGwTXchd_ObKFNzbpXmlOTAWr0_YWN4XLbMWI,24178
+dv_flow/mgr/task_graph_builder.py,sha256=CSrrubqfCeBEKh4dMa69RP2Nhw2QZrY6AlNIC0RNe9g,23524
 dv_flow/mgr/task_graph_dot_writer.py,sha256=GxqiYwQJbFgUQdnPCS9vpIYmYFbSXwnXCSbGmjbxC3M,2418
 dv_flow/mgr/task_listener_log.py,sha256=QH7hAVO1agYJoOx16XqjWv1c-jk5zb6p6A-hic7OMU0,4150
 dv_flow/mgr/task_node.py,sha256=JXq2QimCZKxfhhkdhM-HKk4JbxpIlpW65xUJ0hVlQc0,4981
@@ -43,7 +43,7 @@ dv_flow/mgr/task_node_ctor_def_base.py,sha256=_8QQHKDkONio_ve0Z409yxC0AMO8ocNBPD
 dv_flow/mgr/task_node_ctor_proxy.py,sha256=ViOFJ64JM4-CGFZNl89BghFuKSQ66kZVqSj4v2PA6VA,1906
 dv_flow/mgr/task_node_ctor_task.py,sha256=d49g90TyPCMFR8BuWWqp4ym-MW5vGSdDR0V47Ru28JY,2232
 dv_flow/mgr/task_node_ctor_wrapper.py,sha256=Nb1CVcPHZofnb-iLWDHQWAxlTOdbRrnR9DdSxY8yOec,3626
-dv_flow/mgr/task_node_leaf.py,sha256=wp0wCstQ8eyEJwJcbCqdpei6FvLE0C3-EEBPMjGv3-Y,8488
+dv_flow/mgr/task_node_leaf.py,sha256=oMossZQ-m0wz3_HxcPdrifFDLKD9XV1m_Cow4Ugp6Uo,8652
 dv_flow/mgr/task_output.py,sha256=ZwyvwnYj_gHOEFAEOH3m24Xfc4Cn77hb1j7LkX8_3C4,1086
 dv_flow/mgr/task_params_ctor.py,sha256=qlrzibGAFHmbqOu88jEoh1wOSFHu68Gwdgc259-50e8,1915
 dv_flow/mgr/task_run_ctxt.py,sha256=w1EOG9R16j0eT8fNcOCqlfyFrw277onsSur607eNprY,2811
@@ -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.14370893826a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.0.0.14370893826a1.dist-info/METADATA,sha256=gLrvvQKKh0wI5KalUtQj2i8IRWSVpW5mmCob-EqwoxY,13336
-dv_flow_mgr-1.0.0.14370893826a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-1.0.0.14370893826a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.0.0.14370893826a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.0.0.14370893826a1.dist-info/RECORD,,
+dv_flow_mgr-1.0.0.14389547107a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.0.0.14389547107a1.dist-info/METADATA,sha256=ybdQvgxa9XlrLujXOVPoOx_byLezEkvmAABXjcPwMlU,13336
+dv_flow_mgr-1.0.0.14389547107a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-1.0.0.14389547107a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.0.0.14389547107a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.0.0.14389547107a1.dist-info/RECORD,,