dv-flow-mgr 0.0.1.13661289604a1__py3-none-any.whl → 0.0.1.13667970156a1__py3-none-any.whl

dv_flow/mgr/__init__.py

@@ -9,4 +9,5 @@ from .task_graph_runner_local import TaskGraphRunnerLocal
 from .task_graph_builder import TaskGraphBuilder
 from .task_node import task
 from .task_runner import TaskSetRunner
+from .task_listener_log import TaskListenerLog
 

dv_flow/mgr/package_def.py

@@ -56,6 +56,10 @@ class PackageDef(BaseModel):
     basedir : str = None
     _log : ClassVar = logging.getLogger("PackageDef")
 
+    def __post_init__(self):
+        for t in self.tasks:
+            t.fullname = self.name + "." + t.name
+
     def getTask(self, name : str) -> 'TaskDef':
         for t in self.tasks:
             if t.name == name:
@@ -83,11 +87,13 @@ class PackageDef(BaseModel):
         # Now we have a unified map of the tasks declared in this package
         for name in list(tasks_m.keys()):
             task_i = tasks_m[name]
+            fullname = self.name + "." + name
             if len(task_i) < 3:
                 # Need to create the task ctor
                 ctor_t = self.mkTaskCtor(session, task_i[0], task_i[1], tasks_m)
                 tasks_m[name] = (task_i[0], task_i[1], ctor_t)
             ret.tasks[name] = tasks_m[name][2]
+            ret.tasks[fullname] = tasks_m[name][2]
 
         session.pop_package(ret)
 
@@ -95,7 +101,7 @@ class PackageDef(BaseModel):
         return ret
     
     def getTaskCtor(self, session, task_name, tasks_m):
-        self._log.debug("--> getTaskCtor")
+        self._log.debug("--> getTaskCtor %s" % task_name)
         # Find package (not package_def) that implements this task
         # Insert an indirect reference to that tasks's constructor
         last_dot = task_name.rfind('.')
@@ -132,6 +138,7 @@ class PackageDef(BaseModel):
         needs = [] if task.needs is None else task.needs.copy()
 
         if task.uses is not None:
+            self._log.debug("Uses: %s" % task.uses)
             base_ctor_t = self.getTaskCtor(session, task.uses, tasks_m)
             base_params = base_ctor_t.mkTaskParams()
 
@@ -160,7 +167,7 @@ class PackageDef(BaseModel):
             callable = getattr(mod, clsname)
 
         # Determine if we need to use a new 
-        paramT = self._getParamT(task, base_params)
+        paramT = self._getParamT(session, task, base_params)
         
         if callable is not None:
             ctor_t = TaskNodeCtorTask(
@@ -184,7 +191,7 @@ class PackageDef(BaseModel):
             ctor_t = TaskNodeCtorTask(
                 name=task.name,
                 srcdir=srcdir,
-                paramT=TaskNullParams,
+                paramT=paramT,
                 passthrough=passthrough,
                 needs=needs,
                 task=TaskNull)
@@ -192,7 +199,8 @@ class PackageDef(BaseModel):
         self._log.debug("<-- %s::mkTaskCtor %s" % (self.name, task.name))
         return ctor_t
     
-    def _getParamT(self, task, base_t : BaseModel):
+    def _getParamT(self, session, task, base_t : BaseModel):
+        self._log.debug("--> _getParamT %s" % task.fullname)
         # Get the base parameter type (if available)
         # We will build a new type with updated fields
 
@@ -214,6 +222,8 @@ class PackageDef(BaseModel):
         fields = []
         field_m : Dict[str,int] = {}
 
+        pkg = session.package()
+
         # First, pull out existing fields (if there's a base type)
         if base_t is not None:
             self._log.debug("Base type: %s" % str(base_t))
@@ -255,6 +265,11 @@ class PackageDef(BaseModel):
 
         params_t = pydantic.create_model("Task%sParams" % task.name, **field_m)
 
+        self._log.debug("== Params")
+        for name,info in params_t.model_fields.items():
+            self._log.debug("  %s: %s" % (name, str(info)))
+
+        self._log.debug("<-- _getParamT %s" % task.name)
         return params_t
 
     @staticmethod
@@ -273,7 +288,15 @@ class PackageDef(BaseModel):
             doc = yaml.load(fp, Loader=yaml.FullLoader)
             if "package" not in doc.keys():
                 raise Exception("Missing 'package' key in %s" % root)
-            pkg = PackageDef(**(doc["package"]))
+            try:
+                pkg = PackageDef(**(doc["package"]))
+
+                for t in pkg.tasks:
+                    t.fullname = pkg.name + "." + t.name
+
+            except Exception as e:
+                PackageDef._log.error("Failed to load package from %s" % root)
+                raise e
             pkg.basedir = os.path.dirname(root)
 
 #            for t in pkg.tasks:

dv_flow/mgr/task_def.py

@@ -33,6 +33,7 @@ class TaskSpec(object):
 class TaskDef(BaseModel):
     """Holds definition information (ie the YAML view) for a task"""
     name : str
+    fullname : str = dc.Field(default=None)
 #    type : Union[str,TaskSpec] = dc.Field(default_factory=list)
     uses : str = dc.Field(default=None)
     pytask : str = dc.Field(default=None)

dv_flow/mgr/task_graph_builder.py

@@ -27,7 +27,7 @@ from .package_def import PackageDef, PackageSpec
 from .pkg_rgy import PkgRgy
 from .task import Task
 from .task_node import TaskNodeCtor
-from typing import Dict, List
+from typing import Dict, List, Union
 
 @dc.dataclass
 class TaskGraphBuilder(object):
@@ -178,8 +178,21 @@ class TaskGraphBuilder(object):
         self._logger.debug("<-- getPackage: %s" % str(pkg))
 
         return pkg
+    
+    def mkTaskNode(self, typename, name=None, srcdir=None, needs=None, **kwargs):
+        ctor = self.getTaskCtor(typename)
+        params = ctor.mkTaskParams(**kwargs)
+        return ctor.mkTaskNode(
+            params=params,
+            name=name, 
+            srcdir=srcdir, 
+            needs=needs)
         
-    def getTaskCtor(self, spec : 'TaskSpec', pkg : PackageDef = None) -> 'TaskCtor':
+    def getTaskCtor(self, spec : Union[str,'TaskSpec'], pkg : PackageDef = None) -> 'TaskCtor':
+        from .task_def import TaskSpec
+        if type(spec) == str:
+            spec = TaskSpec(spec)
+
         self._logger.debug("--> getTaskCtor %s" % spec.name)
         spec_e = spec.name.split(".")
         task_name = spec_e[-1]

dv_flow/mgr/task_listener_log.py

@@ -1,15 +1,21 @@
 import dataclasses as dc
+from rich.console import Console
 
+@dc.dataclass
 class TaskListenerLog(object):
+    console : Console = dc.field(default_factory=Console)
+    level : int = 0
 
     def event(self, task : 'Task', reason : 'Reason'):
         if reason == 'enter':
-            print("> Task %s" % task.name, flush=True)
+            self.level += 1
+            self.console.print("[green]>[%d][/green] Task %s" % (self.level, task.name))
         elif reason == 'leave':
             for m in task.result.markers:
                 print("  %s" % m)
-            print("< Task %s" % task.name, flush=True)
+            self.console.print("[green]<[%d][/green] Task %s" % (self.level, task.name))
+            self.level -= 1
         else:
-            print("- Task %s" % task.name, flush=True)
+            self.console.print("[red]-[/red] Task %s" % task.name)
         pass
 

dv_flow/mgr/task_node.py

@@ -108,6 +108,29 @@ class TaskNodeCtor(object):
     paramT : Any
     passthrough : bool
 
+    def __call__(self, 
+                 name=None,
+                 srcdir=None,
+                 params=None,
+                 needs=None,
+                 passthrough=None,
+                 **kwargs):
+        """Convenience method for direct creation of tasks"""
+        if params is None:
+            params = self.mkTaskParams(kwargs)
+        
+        node = self.mkTaskNode(
+            srcdir=srcdir, 
+            params=params, 
+            name=name, 
+            needs=needs)
+        if passthrough is not None:
+            node.passthrough = passthrough
+        else:
+            node.passthrough = self.passthrough
+
+        return node
+
     def getNeeds(self) -> List[str]:
         return []
 
@@ -188,28 +211,7 @@ class TaskNodeCtorTask(TaskNodeCtorDefBase):
 class TaskNodeCtorWrapper(TaskNodeCtor):
     T : Any
 
-    def __call__(self, 
-                 name=None,
-                 srcdir=None,
-                 params=None,
-                 needs=None,
-                 passthrough=None,
-                 **kwargs):
-        """Convenience method for direct creation of tasks"""
-        if params is None:
-            params = self.mkTaskParams(kwargs)
-        
-        node = self.mkTaskNode(
-            srcdir=srcdir, 
-            params=params, 
-            name=name, 
-            needs=needs)
-        if passthrough is not None:
-            node.passthrough = passthrough
-        else:
-            node.passthrough = self.passthrough
 
-        return node
 
     def mkTaskNode(self, params, srcdir=None, name=None, needs=None) -> TaskNode:
         node = TaskNode(name, srcdir, params, self.T, needs=needs)

{dv_flow_mgr-0.0.1.13661289604a1.dist-info → dv_flow_mgr-0.0.1.13667970156a1.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=3t0drSGSlmRfZyoXpj2PkBBUMScaRThyjwxxm9jwAQY,356
+dv_flow/mgr/__init__.py,sha256=2iTpSe1M8g_u2UlAQFa3XFfqcw8gBOWdBvrstce1c5E,403
 dv_flow/mgr/__main__.py,sha256=uik6gDAvtZNG0yyDKYc4FTl6R1QHAR543jNG2lCAa6E,1771
 dv_flow/mgr/eval_jq.py,sha256=Ue-qkyNW6uOu2Wy8u6nrTbPPY7ujaHd0-4iki0eV3Ec,294
 dv_flow/mgr/expr_eval.py,sha256=Mp0TvrV6gZWcj1uYwLfPNI-ARwwdAfwntE5byLBfBuY,2276
@@ -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=EdKwyxqvWT8xQmALGa6BbNv0PMbDLZTr3A27L9coIzc,13761
+dv_flow/mgr/package_def.py,sha256=ek60ERvWFOVlL71_Fgk1-RWQMrkxNt4USrfZXwLS2d0,14603
 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,15 +17,15 @@ 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=PORXrUBoynoj_oYAVISR5NW53OZevZ6hL4T7TutkkHo,1879
+dv_flow/mgr/task_def.py,sha256=T06dvQegPJunH8ekuN5aPxIVcaUWiv5qkfqbZnCacLk,1923
 dv_flow/mgr/task_exec_data.py,sha256=aT__kmVmNxqnS_GbTRS1vrYgKiv8cH-HUSmRb6YYKsI,640
-dv_flow/mgr/task_graph_builder.py,sha256=sswBPUZg71dFT8kaB0towbWIadhNdbTy5gLgvC2uiVA,7276
+dv_flow/mgr/task_graph_builder.py,sha256=okqJDDu6qyubXQoyI-r0jUTd53Tq7ISSYCymZh_Cppw,7708
 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=B9-LEgSF2QwcUREBoUjEsS0rRYg1_ilFHBUKlNeT5YA,444
+dv_flow/mgr/task_listener_log.py,sha256=5N-WG6ii-R6XPbgPR6zcfKjABOoGYab6I_04Lfwux5Q,705
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
-dv_flow/mgr/task_node.py,sha256=iQKiDTC8Oz8tQwLzJF4NpsREg8JPXI-rju5tG7P6dfw,8448
+dv_flow/mgr/task_node.py,sha256=BxkjUJU7WdIhyBbP7FMBFY6EgHenhnnYGGdGW3Xukck,8450
 dv_flow/mgr/task_output.py,sha256=l-W-FvVo6YDah1RQS-I9N0KUtB3vp-kl7lxIdmNz0l4,178
 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=CWrBKImbXKe2d7hJ223U3Ifuxo54zLpFPJviE8BUJvk,188
 dv_flow/mgr/std/task_null.py,sha256=UKwUnqwFPBY8BO44ZAPcgehQB59kHZFa1qyZc1TwUqE,196
-dv_flow_mgr-0.0.1.13661289604a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13661289604a1.dist-info/METADATA,sha256=V3jd8ZAWmysqtJOp69hwulv43S9RGefshb3nt4NE6M4,13276
-dv_flow_mgr-0.0.1.13661289604a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-dv_flow_mgr-0.0.1.13661289604a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13661289604a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13661289604a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13667970156a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13667970156a1.dist-info/METADATA,sha256=KkpZBeRE5Av-3wHTQewdBoyjAtM3voZTDxeXsjrsjhs,13276
+dv_flow_mgr-0.0.1.13667970156a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+dv_flow_mgr-0.0.1.13667970156a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13667970156a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13667970156a1.dist-info/RECORD,,