dv-flow-mgr 0.0.1.13689116055a1__py3-none-any.whl → 0.0.1.13703952342a1__py3-none-any.whl

dv_flow/mgr/package_def.py

@@ -135,6 +135,7 @@ class PackageDef(BaseModel):
         base_params : BaseModel = None
         callable = None
         passthrough = task.passthrough
+        consumes = task.consumes
         needs = [] if task.needs is None else task.needs.copy()
 
         if task.uses is not None:
@@ -180,6 +181,7 @@ class PackageDef(BaseModel):
                 srcdir=srcdir,
                 paramT=paramT, # TODO: need to determine the parameter type
                 passthrough=passthrough,
+                consumes=consumes,
                 needs=needs, # TODO: need to determine the needs
                 task=callable)
         elif base_ctor_t is not None:
@@ -189,6 +191,7 @@ class PackageDef(BaseModel):
                 srcdir=srcdir,
                 paramT=paramT, # TODO: need to determine the parameter type
                 passthrough=passthrough,
+                consumes=consumes,
                 needs=needs,
                 uses=base_ctor_t)
         else:
@@ -198,6 +201,7 @@ class PackageDef(BaseModel):
                 srcdir=srcdir,
                 paramT=paramT,
                 passthrough=passthrough,
+                consumes=consumes,
                 needs=needs,
                 task=TaskNull)
 

dv_flow/mgr/task_def.py

@@ -42,6 +42,8 @@ class TaskDef(BaseModel):
     needs : List[Union[str,TaskSpec]] = dc.Field(default_factory=list, alias="needs")
     params: Dict[str,Union[str,ParamDef]] = dc.Field(default_factory=dict, alias="with")
     passthrough: bool = dc.Field(default=False)
+    consumes : List[Any] = dc.Field(default_factory=list)
+
 #    out: List[TaskOutput] = dc.Field(default_factory=list)
 
     def copy(self) -> 'TaskDef':

dv_flow/mgr/task_node.py

@@ -24,6 +24,7 @@ class TaskNode(object):
     # Runtime fields -- these get populated during execution
     changed : bool = False
     passthrough : bool = False
+    consumes : List[Any] = dc.field(default_factory=list)
     needs : List['TaskNode'] = dc.field(default_factory=list)
     rundir : str = dc.field(default=None)
     output : TaskDataOutput = dc.field(default=None)
@@ -119,8 +120,31 @@ class TaskNode(object):
             # Add an entry for ourselves
             dep_m[self.name] = list(need.name for need in self.needs)
 
-            for need in self.needs:
-                output.extend(need.output.output)
+            if self.consumes is None and len(self.consumes):
+                self._log.debug("Propagating all input parameters to output")
+                for need in self.needs:
+                    output.extend(need.output.output)
+            else:
+                # Filter out parameter sets that were consumed
+                self._log.debug("Propagating non-consumed input parameters to output")
+                for need in self.needs:
+                    for out in need.output.output:
+                        consumed = False
+                        for c in self.consumes:
+                            match = False
+                            for k,v in c.items():
+                                if hasattr(out, k) and getattr(out, k) == v:
+                                    match = True
+                                    break
+                            if match:
+                                consumed = True
+                                break
+                        
+                        if not consumed:
+                            self._log.debug("Propagating type %s from %s" % (
+                                getattr(out, "type", "<unknown>"),
+                                getattr(out, "src", "<unknown>")))
+                            output.append(out)
         else:
             # empty dependency map
             dep_m = {
@@ -156,6 +180,7 @@ class TaskNodeCtor(object):
     srcdir : str
     paramT : Any
     passthrough : bool
+    consumes : List[Any]
 
     def __call__(self, 
                  name=None,
@@ -163,6 +188,7 @@ class TaskNodeCtor(object):
                  params=None,
                  needs=None,
                  passthrough=None,
+                 consumes=None,
                  **kwargs):
         """Convenience method for direct creation of tasks"""
         if params is None:
@@ -177,6 +203,16 @@ class TaskNodeCtor(object):
             node.passthrough = passthrough
         else:
             node.passthrough = self.passthrough
+        if consumes is not None:
+            if node.consumes is None:
+                node.consumes = consumes
+            else:
+                node.consumes.extend(consumes)
+        else:
+            if node.consumes is None:
+                node.consumes = self.consumes
+            else:
+                node.consumes.extend(consumes)
 
         return node
 
@@ -240,6 +276,7 @@ class TaskNodeCtorProxy(TaskNodeCtorDefBase):
             srcdir = self.srcdir
         node = self.uses.mkTaskNode(params=params, srcdir=srcdir, name=name, needs=needs)
         node.passthrough = self.passthrough
+        node.consumes = self.consumes
         return node
     
 @dc.dataclass
@@ -252,6 +289,7 @@ class TaskNodeCtorTask(TaskNodeCtorDefBase):
 
         node = TaskNode(name, srcdir, params, self.task, needs=needs)
         node.passthrough = self.passthrough
+        node.consumes = self.consumes
         node.task = self.task
 
         return node
@@ -265,6 +303,7 @@ class TaskNodeCtorWrapper(TaskNodeCtor):
     def mkTaskNode(self, params, srcdir=None, name=None, needs=None) -> TaskNode:
         node = TaskNode(name, srcdir, params, self.T, needs=needs)
         node.passthrough = self.passthrough
+        node.consumes = self.consumes
         return node
 
     def mkTaskParams(self, params : Dict = None) -> Any:
@@ -294,7 +333,7 @@ class TaskNodeCtorWrapper(TaskNodeCtor):
                     setattr(obj, key, value)
         return obj
 
-def task(paramT,passthrough=False):
+def task(paramT,passthrough=False,consumes=None):
     """Decorator to wrap a task method as a TaskNodeCtor"""
     def wrapper(T):
         task_mname = T.__module__
@@ -304,6 +343,7 @@ def task(paramT,passthrough=False):
             srcdir=os.path.dirname(os.path.abspath(task_module.__file__)), 
             paramT=paramT,
             passthrough=passthrough,
+            consumes=consumes,
             T=T)
         return ctor
     return wrapper

{dv_flow_mgr-0.0.1.13689116055a1.dist-info → dv_flow_mgr-0.0.1.13703952342a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13689116055a1
+Version: 0.0.1.13703952342a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License
@@ -206,7 +206,9 @@ License:                                  Apache License
            limitations under the License.
         
 License-File: LICENSE
+Requires-Dist: jq
 Requires-Dist: pydantic
 Requires-Dist: pyyaml
+Requires-Dist: rich
 Requires-Dist: toposort
 Requires-Dist: svdep

{dv_flow_mgr-0.0.1.13689116055a1.dist-info → dv_flow_mgr-0.0.1.13703952342a1.dist-info}/RECORD

@@ -7,7 +7,7 @@ dv_flow/mgr/fileset.py,sha256=ewyjKLzuOecZg0vtabN_UkbzNEnk1sXgrH8uDyeKB60,1184
 dv_flow/mgr/fragment_def.py,sha256=cyzp1XeWtNOaagScmeS-BPsoXj9j2LTBbKq5ZUioz8I,1641
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=878twhPD-E1pFlDNUtuyeFEgJ_Y89b560og4St-Iwrs,1679
-dv_flow/mgr/package_def.py,sha256=EaDPLljg6iewOuZwUgAF4lTkLH9fYAgigD2klXaKBRE,14779
+dv_flow/mgr/package_def.py,sha256=q8lT8MlDF7nDYTBqtPVQSXdGeN06kceZ3qBH7WhP0Bs,14917
 dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
 dv_flow/mgr/param.py,sha256=3BY-ucig6JRw73FhjyJQL-vpd57qhAzixgZ8I5FoUpw,553
 dv_flow/mgr/param_def.py,sha256=gLua-EQiY8V2CFX-2svLRIlrs8PEeGh4-EPtn4a2Mng,712
@@ -17,7 +17,7 @@ dv_flow/mgr/pkg_rgy.py,sha256=2R_EaeBDJn5qUq9DzSnLc37wUP36MWSv-p0LgUjJRAg,4471
 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
-dv_flow/mgr/task_def.py,sha256=T06dvQegPJunH8ekuN5aPxIVcaUWiv5qkfqbZnCacLk,1923
+dv_flow/mgr/task_def.py,sha256=t5_oDTngtEPRdipQnuJ2ofJrpva1kTecHl4w4mI4GXE,1982
 dv_flow/mgr/task_exec_data.py,sha256=aT__kmVmNxqnS_GbTRS1vrYgKiv8cH-HUSmRb6YYKsI,640
 dv_flow/mgr/task_graph_builder.py,sha256=fEqJalmDDDzayJbuyDWAcmumDGK3XgnZmcScoBY8HGg,7887
 dv_flow/mgr/task_graph_runner.py,sha256=jUGI49QvxUCfQoKQDDk2psbeapIcCg72qNOW1JipHzM,2182
@@ -25,7 +25,7 @@ dv_flow/mgr/task_graph_runner_local.py,sha256=OrydPwtQ8E7hYWvSXx0h7lI3nfUNFyklUL
 dv_flow/mgr/task_impl_data.py,sha256=bFPijoKrh9x7fZN2DsvRJp0UHo-gGM0VjtDQISyfhFk,321
 dv_flow/mgr/task_listener_log.py,sha256=u7hm8Q8ZVCIY25mNQEI3DIgSMJ_zJ5nbvqukGMXyido,934
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
-dv_flow/mgr/task_node.py,sha256=5R51VLuHDFnY3c5E8kLccxFRoshJRB1bDKJXIJr9EKc,10394
+dv_flow/mgr/task_node.py,sha256=leuQC3IPyZQsJKQwKBTQgvstXxH7Fk10eDINoaK7718,12212
 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=Ky10BWKy_NhvJp2nsbB0pyS8n1K0pKatBEmTdD1ZKOc,7071
@@ -39,9 +39,9 @@ dv_flow/mgr/std/fileset.py,sha256=abHgTxz25FD1ep5QXlCZKt4gCyfplJsjx6LyfQ11f_Q,26
 dv_flow/mgr/std/flow.dv,sha256=jlFOh3xVECOzHws7x6YvJ9eCIGHM5gsPeEnheiGOukY,1553
 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.13689116055a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13689116055a1.dist-info/METADATA,sha256=fuUi6tX_RwxMXl0XsApdKkyUlKyKOgYaouavIevi0w4,13276
-dv_flow_mgr-0.0.1.13689116055a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-dv_flow_mgr-0.0.1.13689116055a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13689116055a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13689116055a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13703952342a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13703952342a1.dist-info/METADATA,sha256=N1CO707jpDo9FEXJ2Xujl7IGNo4Bt8LRW1NrpJnK47k,13314
+dv_flow_mgr-0.0.1.13703952342a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+dv_flow_mgr-0.0.1.13703952342a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13703952342a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13703952342a1.dist-info/RECORD,,