dv-flow-mgr 0.0.1.13798183675a1__py3-none-any.whl → 0.0.1.13824498694a1__py3-none-any.whl

dv_flow/mgr/package_def.py

@@ -347,8 +347,27 @@ class PackageDef(BaseModel):
             if not os.path.isabs(imp_path):
                 cls._log.debug("basedir: %s ; imp_path: %s" % (pkg.basedir, imp_path))
                 imp_path = os.path.join(pkg.basedir, imp_path)
-            if os.path.isdir(imp_path) and os.path.isfile(os.path.join(imp_path, "flow.dv")):
-                imp_path = os.path.join(imp_path, "flow.dv")
+            
+            # Search down the tree looking for a flow.dv file
+            if os.path.isdir(imp_path):
+                path = imp_path
+
+                while path is not None and os.path.isdir(path) and not os.path.isfile(os.path.join(path, "flow.dv")):
+                    # Look one directory down
+                    next_dir = None
+                    for dir in os.listdir(path):
+                        if os.path.isdir(os.path.join(path, dir)):
+                            if next_dir is None:
+                                next_dir = dir
+                            else:
+                                path = None
+                                break
+                    if path is not None:
+                        path = next_dir
+
+                if path is not None and os.path.isfile(os.path.join(path, "flow.dv")):
+                    imp_path = os.path.join(path, "flow.dv")
+
             if not os.path.isfile(imp_path):
                 raise Exception("Import file %s not found" % imp_path)
 

dv_flow/mgr/task_data.py

@@ -48,6 +48,7 @@ class TaskDataInput(BaseModel):
     srcdir : str
     rundir : str
     params : Any
+    inputs : List[Any]
     memento : Any
 
 class TaskDataResult(BaseModel):

dv_flow/mgr/task_listener_log.py

@@ -4,10 +4,13 @@ from rich.console import Console
 
 @dc.dataclass
 class TaskListenerLog(object):
-    console : Console = dc.field(default_factory=Console)
+    console : Console = dc.field(default=None)
     level : int = 0
     quiet : bool = False
 
+    def __post_init__(self):
+        self.console = Console(highlight=False)
+
     def event(self, task : 'Task', reason : 'Reason'):
         if reason == 'enter':
             self.level += 1

dv_flow/mgr/task_node.py

@@ -86,6 +86,13 @@ class TaskNode(object):
         self._log.debug("in_params[2]: %s" % ",".join(p.src for p in in_params))
         eval.setVar("in", in_params)
 
+        # Default inputs is the list of parameter sets that match 'consumes'
+        inputs = []
+        if self.consumes is not None and len(self.consumes):
+            for in_p in in_params:
+                if self._matches(in_p, self.consumes):
+                    inputs.append(in_p)
+
         for name,field in self.params.model_fields.items():
             value = getattr(self.params, name)
             if type(value) == str:
@@ -107,6 +114,7 @@ class TaskNode(object):
             srcdir=self.srcdir,
             rundir=rundir,
             params=self.params,
+            inputs=inputs,
             memento=memento)
 
         self._log.debug("--> Call task method %s" % str(self.task))
@@ -134,26 +142,28 @@ class TaskNode(object):
                 self._log.debug("consumes: %s" % str(self.consumes))
                 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():
-                                self._log.debug("k,v: %s,%s" % (k,v))
-                                if hasattr(out, k):
-                                    self._log.debug("has attribute: %s" % str(getattr(out ,k)))
-                                    if getattr(out, k) == v:
-                                        self._log.debug("match")
-                                        match = True
-                                        break
-                            if match:
-                                consumed = True
-                                break
-                        
-                        if not consumed:
+                        if not self._matches(out, self.consumes):
                             self._log.debug("Propagating type %s from %s" % (
                                 getattr(out, "type", "<unknown>"),
                                 getattr(out, "src", "<unknown>")))
                             output.append(out)
+
+                        # consumed = False
+                        # for c in self.consumes:
+                        #     match = False
+                        #     for k,v in c.items():
+                        #         self._log.debug("k,v: %s,%s" % (k,v))
+                        #         if hasattr(out, k):
+                        #             self._log.debug("has attribute: %s" % str(getattr(out ,k)))
+                        #             if getattr(out, k) == v:
+                        #                 self._log.debug("match")
+                        #                 match = True
+                        #                 break
+                        #     if match:
+                        #         consumed = True
+                        #         break
+                        
+                        # if not consumed:
         else:
             self._log.debug("non-passthrough: %s (only local outputs propagated)" % self.name)
             # empty dependency map
@@ -342,6 +352,24 @@ class TaskNodeCtorWrapper(TaskNodeCtor):
                 else:
                     setattr(obj, key, value)
         return obj
+    
+    def _matches(self, params, consumes):
+        """Determines if a parameter set matches a set of consumed parameters"""
+        consumed = False
+        for c in consumes:
+            # All matching attribute keys must have same value
+            match = False
+            for k,v in c.items():
+                if hasattr(params, k):
+                    if getattr(params, k) != v:
+                        match = True
+                    else:
+                        match = False
+                        break
+            if match:
+                consumed = True
+                break
+        return consumed
 
 def task(paramT,passthrough=False,consumes=None):
     """Decorator to wrap a task method as a TaskNodeCtor"""

dv_flow/mgr/task_runner.py

@@ -195,6 +195,7 @@ class SingleTaskRunner(TaskRunner):
             srcdir=task.srcdir,
             rundir=self.rundir,
             params=task.params,
+            inputs=[],
             memento=memento)
 
         # TODO: notify of task start

{dv_flow_mgr-0.0.1.13798183675a1.dist-info → dv_flow_mgr-0.0.1.13824498694a1.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ dv_flow/mgr/fileset.py,sha256=_EhtqBVn0prylXJhR3dUV2p7ocGHzNAF_ZtYNgeKJhs,1240
 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=xF7xiloNUh1JW1i4e3G7M8WLRD9TFyZ41fown-L-3Pg,16436
+dv_flow/mgr/package_def.py,sha256=EChN0LwvAcrASBSlzQ3LaWqt_SyFaedfPEujG9FNj6Y,17188
 dv_flow/mgr/package_import_spec.py,sha256=K5bwbO82A7MB5WeR7kmzWk7wQmQbQVMG1BOtpSPKQRU,1755
 dv_flow/mgr/param.py,sha256=3BY-ucig6JRw73FhjyJQL-vpd57qhAzixgZ8I5FoUpw,553
 dv_flow/mgr/param_def.py,sha256=gLua-EQiY8V2CFX-2svLRIlrs8PEeGh4-EPtn4a2Mng,712
@@ -16,19 +16,19 @@ dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
 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
+dv_flow/mgr/task_data.py,sha256=m3W7k-xv09ZyhpP2gg33CLOhBLyQDJS2mlG35yOZjZQ,11432
 dv_flow/mgr/task_def.py,sha256=Wmh78mQLAiHXlpD2KCvFxTWtnjjwgct8fEm8gelCg1c,1987
 dv_flow/mgr/task_exec_data.py,sha256=aT__kmVmNxqnS_GbTRS1vrYgKiv8cH-HUSmRb6YYKsI,640
 dv_flow/mgr/task_graph_builder.py,sha256=AOltPyzd2Q9B67m0MyL59RPu3i2d5QrX3K-0gKWLoY8,9097
 dv_flow/mgr/task_graph_runner.py,sha256=jUGI49QvxUCfQoKQDDk2psbeapIcCg72qNOW1JipHzM,2182
 dv_flow/mgr/task_graph_runner_local.py,sha256=OrydPwtQ8E7hYWvSXx0h7lI3nfUNFyklULhsyMwz9dA,4687
 dv_flow/mgr/task_impl_data.py,sha256=bFPijoKrh9x7fZN2DsvRJp0UHo-gGM0VjtDQISyfhFk,321
-dv_flow/mgr/task_listener_log.py,sha256=ed9CA_4WzknnDDZPHMT020wouLn_0iUKWcHp7oqvQTs,2616
+dv_flow/mgr/task_listener_log.py,sha256=d4GQcT3n_0Dq-XWQP-WNJIhuxvw948RbFPSiJ6X1_eI,2683
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
-dv_flow/mgr/task_node.py,sha256=uuJGDgSySUyt2hz-I78w47fqpq4cIYtzrVj4RdKr_Cg,12765
+dv_flow/mgr/task_node.py,sha256=oj9vZ9XxuqavBXY8uXKY_jE6y8jPoIhN1qC9b188SbY,13799
 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=SHbhGfuOUmlbk-nZDDuk9FX7syWWcgmCuOZ2LwG5UFM,7799
+dv_flow/mgr/task_runner.py,sha256=Z081AjdUQ6kK8bPgKU8m8rFRHbX8ce4lOI9kLQ5WF_w,7822
 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
@@ -39,9 +39,9 @@ dv_flow/mgr/std/fileset.py,sha256=nW5Cg4IyCs-ccKKsIxA5W5aZvaluFk6LXDyFh9Jixcs,30
 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.13798183675a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13798183675a1.dist-info/METADATA,sha256=zxFHS50yoo3mjE0iKFdX-5ikdCmlj53Mrb2FaS5fNUA,13314
-dv_flow_mgr-0.0.1.13798183675a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-dv_flow_mgr-0.0.1.13798183675a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13798183675a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13798183675a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13824498694a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13824498694a1.dist-info/METADATA,sha256=Q8cuFrb6MAt6RBEYlMrMk1VyTmJvFifOB4YaDmhxwEQ,13314
+dv_flow_mgr-0.0.1.13824498694a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+dv_flow_mgr-0.0.1.13824498694a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13824498694a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13824498694a1.dist-info/RECORD,,