dv-flow-mgr 0.0.1.13478128278a1__py3-none-any.whl → 0.0.1.13525773676a1__py3-none-any.whl

dv_flow/mgr/expr_eval.py

@@ -9,16 +9,26 @@ class ExprEval(ExprVisitor):
     variables : Dict[str, object] = dc.field(default_factory=dict)
     value : Any = None
 
-    def eval(self, e : Expr):
+    def eval(self, e : Expr) -> str:
         self.value = None
         e.accept(self)
-        return self.value
+
+        val = self._toString(self.value)
+
+        return val
+    
+    def _toString(self, val):
+        if isinstance(val, list):
+            val = '[' + ",".join(self._toString(v) for v in val) + ']'
+        elif hasattr(val, "model_dump_json"):
+            val = val.model_dump_json()
+        return val
 
     def visitExprId(self, e : ExprId):
         if e.id in self.variables:
             self.value = self.variables[e.id]
         else:
-            raise Exception("Variable %s not found" % e.id)
+            raise Exception("Variable '%s' not found" % e.id)
 
     def visitExprString(self, e : ExprString):
         self.value = e.value

dv_flow/mgr/param_ref_eval.py

@@ -0,0 +1,44 @@
+import dataclasses as dc
+import json
+from .expr_eval import ExprEval
+from .expr_parser import ExprParser
+
+@dc.dataclass
+class ParamRefEval(object):
+
+    parser : ExprParser = ExprParser()
+    expr_eval : ExprEval = ExprEval()
+
+    def eval(self, val : str) -> str:
+        idx = 0
+
+        while True:
+            idx = val.find("${{", idx)
+
+            if idx != -1:
+                eidx = val.find("}}", idx+1)
+
+                if eidx == -1:
+                    raise Exception("unterminated variable ref")
+                
+                ref = val[idx+3:eidx].strip()
+                print("ref: %s" % ref)
+
+                expr_ast = self.parser.parse(ref)
+                print("expr_ast: %s" % str(expr_ast))
+                exp_val = self.expr_eval.eval(expr_ast)
+                print("exp_val: %s" % str(exp_val))
+
+                # Replacing [idx..eidx+2] with len(exp_val)
+                val = val[:idx] + exp_val + val[eidx+2:]
+                idx += len(exp_val)
+
+
+
+            else:
+                break
+
+        return val
+    
+    def setVar(self, name, value):
+        self.expr_eval.variables[name] = value

dv_flow/mgr/task_data.py

@@ -37,6 +37,10 @@ class TaskMarker(BaseModel):
     severity : str
     loc : TaskMarkerLoc = dc.Field(default=None)
 
+class TaskParameterSet(BaseModel):
+    task : str = None # Name of the task that produced this param set
+    seq : int  = -1 # Order in which the param-set must appear
+
 class TaskDataInput(BaseModel):
     changed : bool
     srcdir : str
@@ -46,14 +50,15 @@ class TaskDataInput(BaseModel):
 
 class TaskDataResult(BaseModel):
     changed : bool = dc.Field(default=True)
-    output : List[Any] = dc.Field(default_factory=list)
+    output : List[TaskParameterSet] = dc.Field(default_factory=list)
     memento : Any = dc.Field(default=None)
     markers : List[TaskMarker] = dc.Field(default_factory=list)
     status : int = dc.Field(default=0)
 
 class TaskDataOutput(BaseModel):
-    changed : bool
-    output : List[Any]
+    changed : bool = True
+    output : List[TaskParameterSet] = dc.Field(default_factory=list)
+    dep_m : Dict[str,List[str]] = dc.Field(default_factory=dict)
 
 class TaskDataParamOpE(enum.Enum):
     Set = enum.auto()

dv_flow/mgr/task_node.py

@@ -0,0 +1,142 @@
+
+import dataclasses as dc
+import pydantic.dataclasses as pdc
+import logging
+from typing import Any, Callable, ClassVar, Dict, List
+from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
+from .task_params_ctor import TaskParamsCtor
+from .param_ref_eval import ParamRefEval
+
+@dc.dataclass
+class TaskNode(object):
+    """Executable view of a task"""
+    # Ctor fields -- must specify on construction
+    name : str
+    srcdir : str
+    # This can be the resolved parameters
+    params : TaskParamsCtor 
+
+    task : Callable[['TaskRunner','TaskDataInput'],'TaskDataResult']
+
+    # Runtime fields -- these get populated during execution
+    changed : bool = False
+    needs : List['TaskNode'] = dc.field(default_factory=list)
+    rundir : str = dc.field(default=None)
+    output : TaskDataOutput = dc.field(default=None)
+
+    _log : ClassVar = logging.getLogger("TaskNode")
+
+    async def do_run(self, 
+                  runner,
+                  rundir,
+                  memento : Any = None) -> 'TaskDataResult':
+        changed = False
+        for dep in self.needs:
+            changed |= dep.changed
+
+        # TODO: Form dep-map from inputs
+        # TODO: Order param sets according to dep-map
+        in_params = []
+        for need in self.needs:
+            in_params.extend(need.output.output)
+
+        # TODO: create an evaluator for substituting param values
+        eval = ParamRefEval()
+
+        eval.setVar("in", in_params)
+
+        for name,field in self.params.model_fields.items():
+            value = getattr(self.params, name)
+            if value.find("${{") != -1:
+                new_val = eval.eval(value)
+                setattr(self.params, name, new_val)
+                print("TODO: expand")
+            print("Field: %s %s" % (name, str(value)))
+            pass
+
+        input = TaskDataInput(
+            changed=changed,
+            srcdir=self.srcdir,
+            rundir=rundir,
+            params=self.params,
+            memento=memento)
+
+        # TODO: notify of task start
+        ret : TaskDataResult = await self.task(self, input)
+        # TODO: notify of task complete
+
+        # TODO: form a dep map from the outgoing param sets
+        dep_m = {}
+
+        # Store the result
+        self.output = TaskDataOutput(
+            changed=ret.changed,
+            dep_m=dep_m,
+            output=ret.output.copy())
+
+        # TODO: 
+
+        return ret
+
+    def __hash__(self):
+        return id(self)
+    
+@staticmethod
+def task(paramT):
+    def wrapper(T):
+        ctor = TaskNodeCtorWrapper(T.__name__, T, paramT)
+        return ctor
+    return wrapper
+
+@dc.dataclass
+class TaskNodeCtor(object):
+    """
+    Factory for a specific task type
+    - Produces a task parameters object, applying value-setting instructions
+    - Produces a TaskNode
+    """
+    name : str
+
+
+    def mkTaskNode(self, srcdir, params, name=None) -> TaskNode:
+        raise NotImplementedError("mkTaskNode in type %s" % str(type(self)))
+
+    def mkTaskParams(self, params : Dict) -> Any:
+        raise NotImplementedError("mkTaskParams in type %s" % str(type(self)))
+
+@dc.dataclass
+class TaskNodeCtorWrapper(TaskNodeCtor):
+    T : Any
+    paramT : Any
+
+    def __call__(self, 
+                 srcdir, 
+                 name=None, 
+                 params=None, 
+                 needs=None,
+                 **kwargs):
+        """Convenience method for direct creation of tasks"""
+        if params is None:
+            params = self.mkTaskParams(kwargs)
+        
+        node = self.mkTaskNode(srcdir, params, name)
+        if needs is not None:
+            node.needs.extend(needs)
+        return node
+
+    def mkTaskNode(self, srcdir, params, name=None) -> TaskNode:
+        node = TaskNode(name, srcdir, params, self.T)
+        return node
+
+    def mkTaskParams(self, params : Dict) -> Any:
+        obj = self.paramT()
+
+        # Apply user-specified params
+        for key,value in params.items():
+            if not hasattr(obj, key):
+                raise Exception("Parameters class %s does not contain field %s" % (
+                    str(type(obj)),
+                    key))
+            else:
+                setattr(obj, key, value)
+        return obj

dv_flow/mgr/task_runner.py

@@ -1,6 +1,9 @@
+import asyncio
 import dataclasses as dc
-from .task_data import TaskDataInput, TaskDataResult
-from typing import Any, Callable, List, Tuple
+from toposort import toposort
+from typing import Any, Callable, List, Tuple, Union
+from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
+from .task_node import TaskNode
 
 @dc.dataclass
 class TaskRunner(object):
@@ -19,6 +22,57 @@ class TaskRunner(object):
                   memento : Any = None) -> 'TaskDataResult':
         pass
 
+@dc.dataclass
+class TaskSetRunner(TaskRunner):
+    nproc : int = 8
+
+    async def run(self, task : Union[TaskNode,List[TaskNode]]):
+        # First, build a depedency map
+        tasks = task if isinstance(task, list) else [task]
+        dep_m = {}
+        for t in tasks:
+            self._buildDepMap(dep_m, t)
+
+        print("dep_m: %s" % str(dep_m))
+
+        order = list(toposort(dep_m))
+
+        active_task_l = []
+        done_task_s = set()
+        for active_s in order:
+            done = True
+            for t in active_s:
+                while len(active_task_l) >= self.nproc and t not in done_task_s:
+                    # Wait for at least one job to complete
+                    done, pending = await asyncio.wait(at[1] for at in active_task_l)
+                    for d in done:
+                        for i in range(len(active_task_l)):
+                            if active_task_l[i][1] == d:
+                                tt = active_task_l[i][0]
+                                done_task_s.add(tt)
+                                active_task_l.pop(i)
+                                break
+                if t not in done_task_s:
+                    coro = asyncio.Task(t.do_run(
+                        self,
+                        self.rundir, # TODO
+                        None)) # TODO: memento
+                    active_task_l.append((t, coro))
+               
+            # Now, wait for tasks to complete
+            if len(active_task_l):
+                coros = list(at[1] for at in active_task_l)
+                res = await asyncio.gather(*coros)
+
+
+        pass
+
+    def _buildDepMap(self, dep_m, task : TaskNode):
+        if task not in dep_m.keys():
+            dep_m[task] = set(task.needs)
+            for need in task.needs:
+                self._buildDepMap(dep_m, need)
+
 @dc.dataclass
 class SingleTaskRunner(TaskRunner):
 
@@ -32,15 +86,36 @@ class SingleTaskRunner(TaskRunner):
         # TODO: create an evaluator for substituting param values
         eval = None
 
-        params = task.params.mk(eval)
+        for field in dc.fields(task.params):
+            print("Field: %s" % field.name)
 
         input = TaskDataInput(
             changed=changed,
             srcdir=task.srcdir,
             rundir=self.rundir,
-            params=params,
+            params=task.params,
             memento=memento)
-        
-        ret = await task.run(self, input)
+
+        # TODO: notify of task start
+        ret : TaskDataResult = await task.task(self, input)
+        # TODO: notify of task complete
+
+        # Store the result
+        task.output = TaskDataOutput(
+            changed=ret.changed,
+            output=ret.output.copy())
+
+        # # By definition, none of this have run, since we just ran        
+        # for dep in task.dependents:
+        #     is_sat = True
+        #     for need in dep.needs:
+        #         if need.output is None:
+        #             is_sat = False
+        #             break
+            
+        #     if is_sat:
+        #         # TODO: queue task for evaluation
+        #     pass
+        # TODO: 
 
         return ret

{dv_flow_mgr-0.0.1.13478128278a1.dist-info → dv_flow_mgr-0.0.1.13525773676a1.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 dv_flow/mgr/__init__.py,sha256=IZA7I1u7RH34DrJXSkETxWFpK5Jn_A2zXfnCAzJ8XxA,289
 dv_flow/mgr/__main__.py,sha256=uik6gDAvtZNG0yyDKYc4FTl6R1QHAR543jNG2lCAa6E,1771
-dv_flow/mgr/expr_eval.py,sha256=pfnTDurXPTURgpdzlno5XtXlkoPfnJmAAq45G9T2D3k,1517
+dv_flow/mgr/expr_eval.py,sha256=M8qTIEnnbff8BCbxvNIztYyG-BJGSe_cLexfqYr3E0w,1807
 dv_flow/mgr/expr_parser.py,sha256=aR8n6hgk5xmFknIaSVC02K-So-eU4pkkFtwb7zWsSPs,5474
 dv_flow/mgr/fileset.py,sha256=FNvC5sU2ArxJ0OO3v8dXTv8zX-bZ5t0a0ljne0fQQ1o,1150
 dv_flow/mgr/fragment_def.py,sha256=cyzp1XeWtNOaagScmeS-BPsoXj9j2LTBbKq5ZUioz8I,1641
@@ -9,11 +9,12 @@ dv_flow/mgr/package.py,sha256=878twhPD-E1pFlDNUtuyeFEgJ_Y89b560og4St-Iwrs,1679
 dv_flow/mgr/package_def.py,sha256=dwvs-7kGEp7wFrBK2Fybysb-vSKwtWOtxTrg1VIaL14,14975
 dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
 dv_flow/mgr/param_def.py,sha256=e2WvRCMArbgcsKC4TKQqZTscZmCdo3WvVR6w3LN0VK8,727
+dv_flow/mgr/param_ref_eval.py,sha256=MLJNUgvvgxEPzr16vLPUvGwn9lHkKohr7xVAaZhU7Yk,1129
 dv_flow/mgr/parsetab.py,sha256=enSOnMQ-woIsMEzHyeYiefvhAl8enxfX9Ct_o8-jkqs,3780
 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=fkaVzQ81nJBXy4uPWPdnVCNoD9L7rvH5Abt8LXzvnJs,11098
+dv_flow/mgr/task_data.py,sha256=9c5NrVZWECHFXrCPOpwZBQXRhr1O3ni5aFeP2I1P5Rw,11398
 dv_flow/mgr/task_def.py,sha256=WAW1fPXUfUiQcfmgCx0iCMddMBKATDa5RsRztJWRbUk,1819
 dv_flow/mgr/task_exec_data.py,sha256=aT__kmVmNxqnS_GbTRS1vrYgKiv8cH-HUSmRb6YYKsI,640
 dv_flow/mgr/task_graph_builder.py,sha256=-lRSjWU2UJf3euVIFtoVIU7Qdox7MI1sKERWg1k7U_g,7058
@@ -21,9 +22,10 @@ dv_flow/mgr/task_graph_runner.py,sha256=jUGI49QvxUCfQoKQDDk2psbeapIcCg72qNOW1Jip
 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_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
+dv_flow/mgr/task_node.py,sha256=CTMfBzKR_kSs10sLxA0NC9HihqsOTHJ49k5oPfcZyNU,4192
 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=XrVYZ13qIbGDkLgDT-NAq_qd2plCqVjHKEe25MD-7xE,1272
+dv_flow/mgr/task_runner.py,sha256=JmerE6CyXiJJK7-n6P65OzwW9UTYFQqV8Cck7eHe0B8,3882
 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
@@ -33,9 +35,9 @@ dv_flow/mgr/std/fileset.py,sha256=uP7bGntRq-Tn5_GEFnt0_J_OAmfvep3GlCwCuE8by4o,27
 dv_flow/mgr/std/flow.dv,sha256=j9wLrF3Ghh1ZLbJxmk7WiNiRYUYEer-8CCUA5hsgtfk,1409
 dv_flow/mgr/std/message.py,sha256=BPTHnEMD4tBufQ9LvsS9Sa_0xjaJATbBpwqosWslvVA,193
 dv_flow/mgr/std/task_null.py,sha256=KObmjG_4D08GJ1k6neqKIQrFY72Sj0jLnwXxEkq5HA0,321
-dv_flow_mgr-0.0.1.13478128278a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13478128278a1.dist-info/METADATA,sha256=HCQCME5rxfNs5HNZ0WmoQtIQMTWNtZzkGrfwhXoO09I,13276
-dv_flow_mgr-0.0.1.13478128278a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dv_flow_mgr-0.0.1.13478128278a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13478128278a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13478128278a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13525773676a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13525773676a1.dist-info/METADATA,sha256=Bg3ASctj2O6u1eTnAZ9_FKztQjpslQZC0fr7SCSqg6c,13276
+dv_flow_mgr-0.0.1.13525773676a1.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+dv_flow_mgr-0.0.1.13525773676a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13525773676a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13525773676a1.dist-info/RECORD,,

{dv_flow_mgr-0.0.1.13478128278a1.dist-info → dv_flow_mgr-0.0.1.13525773676a1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.1)
 Root-Is-Purelib: true
 Tag: py3-none-any