dv-flow-mgr 1.0.0.14392445998a1__py3-none-any.whl → 1.0.0.14457729129a1__py3-none-any.whl

dv_flow/mgr/package_loader.py

@@ -394,6 +394,10 @@ class PackageLoader(object):
             else:
                 print("Warning: file %s is not a fragment" % file)
 
+    def getTask(self, name) -> Task:
+        task = self._findTask(name)
+        return task
+
     def _loadTasks(self, pkg, taskdefs : List[TaskDef], basedir : str):
         self._log.debug("--> _loadTasks %s" % pkg.name)
         # Declare first
@@ -538,10 +542,16 @@ class PackageLoader(object):
         self._pkg_s[-1].pop_scope()
 
     def _findTaskType(self, name):
-        return self._pkg_s[-1].find(name)
+        if len(self._pkg_s):
+            return self._pkg_s[-1].find(name)
+        else:
+            return self._loader_scope.find(name)
 
     def _findTask(self, name):
-        return self._pkg_s[-1].find(name)
+        if len(self._pkg_s):
+            return self._pkg_s[-1].find(name)
+        else:
+            return self._loader_scope.find(name)
 
     
     def _getScopeFullname(self, leaf=None):

dv_flow/mgr/task_graph_builder.py

@@ -25,6 +25,7 @@ import logging
 from typing import Callable, Any, Dict, List, Union
 from .package import Package
 from .package_def import PackageDef, PackageSpec
+from .package_loader import PackageLoader
 from .ext_rgy import ExtRgy
 from .task import Task
 from .task_def import RundirE
@@ -60,6 +61,7 @@ class TaskGraphBuilder(object):
     """The Task-Graph Builder knows how to discover packages and construct task graphs"""
     root_pkg : Package
     rundir : str
+    loader : PackageLoader = None
     marker_l : Callable = lambda *args, **kwargs: None
     _pkg_m : Dict[PackageSpec,Package] = dc.field(default_factory=dict)
     _pkg_spec_s : List[PackageDef] = dc.field(default_factory=list)
@@ -79,7 +81,7 @@ class TaskGraphBuilder(object):
     def __post_init__(self):
         # Initialize the overrides from the global registry
         self._log = logging.getLogger(type(self).__name__)
-        self._shell_m.update(ExtRgy._inst._shell_m)
+        self._shell_m.update(ExtRgy.inst()._shell_m)
         self._task_rundir_s.append([])
 
         if self.root_pkg is not None:
@@ -210,10 +212,18 @@ class TaskGraphBuilder(object):
 
         if task_t in self._task_m.keys():
             task = self._task_m[task_t]
+        elif self.loader is not None:
+            task = self.loader.getTask(task_t)
+
+            if task is None:
+                raise Exception("task_t (%s) not present" % str(task_t))
         else:
             raise Exception("task_t (%s) not present" % str(task_t))
         
-        ret = self._mkTaskNode(task)
+        ret = self._mkTaskNode(
+            task, 
+            name=name, 
+            srcdir=srcdir)
 
         if needs is not None:
             for need in needs:
@@ -225,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):
@@ -290,7 +300,7 @@ class TaskGraphBuilder(object):
             params = task.paramT()
 
         if task.rundir == RundirE.Unique:
-            self.enter_rundir(task.name)
+            self.enter_rundir(name)
 
 
         callable = None
@@ -341,7 +351,7 @@ class TaskGraphBuilder(object):
             params = task.paramT()
 
         if task.rundir == RundirE.Unique:
-            self.enter_rundir(task.name)
+            self.enter_rundir(name)
 
         if task.uses is not None:
             # This is a compound task that is based on
@@ -376,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)
             node.input.needs.append((need_n, False))
+#            node.needs.append((need_n, False))
         self._log.debug("<-- processing needs")
 
         # TODO: handle strategy
@@ -429,12 +440,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" % tn.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()
@@ -442,7 +453,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)
 
@@ -451,7 +462,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.14392445998a1.dist-info → dv_flow_mgr-1.0.0.14457729129a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.0.0.14392445998a1
+Version: 1.0.0.14457729129a1
 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.14392445998a1.dist-info → dv_flow_mgr-1.0.0.14457729129a1.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=Z80md4ZhJk6TPVlvYAWlnH1aJvATlB9skIyb1pZ1P8U,25075
+dv_flow/mgr/package_loader.py,sha256=xNdN9aNVRDzSeU2YDMEk6rWPfNphQniehg1UdW91w-k,25361
 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,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=h0jiGY4VQI-wLJevawHl40wTILiMulA2eZpi0jFJ82A,16739
+dv_flow/mgr/task_graph_builder.py,sha256=AMvvQjRLkjPYw5JfKw3ZaF1f02E9FJHBAUtulj4mJBM,17210
 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.14392445998a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.0.0.14392445998a1.dist-info/METADATA,sha256=B60agWgNKhS9gxExLemROgmyWl_S8SpiF2OqDjCyAKg,13336
-dv_flow_mgr-1.0.0.14392445998a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-1.0.0.14392445998a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.0.0.14392445998a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.0.0.14392445998a1.dist-info/RECORD,,
+dv_flow_mgr-1.0.0.14457729129a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.0.0.14457729129a1.dist-info/METADATA,sha256=zEZXmvd8jfMK3AM4X8znfRsXyztd19PkyZqiU_P_LKk,13336
+dv_flow_mgr-1.0.0.14457729129a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-1.0.0.14457729129a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.0.0.14457729129a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.0.0.14457729129a1.dist-info/RECORD,,