dv-flow-mgr 0.0.1.14147547123a1__py3-none-any.whl → 0.0.2.14148837747a1__py3-none-any.whl

dv_flow/mgr/cmds/cmd_run.py

@@ -90,7 +90,7 @@ class CmdRun(object):
         for spec in args.tasks:
             if spec.find('.') == -1:
                 spec = pkg.name + "." + spec
-            task = builder.mkTaskGraph(spec)
+            task = builder.mkTaskGraph(spec, rundir=spec)
             tasks.append(task)
 
         asyncio.run(runner.run(tasks))

dv_flow/mgr/package_def.py

@@ -317,7 +317,7 @@ class PackageDef(BaseModel):
         consumes = task.consumes.copy() if isinstance(task.consumes, list) else task.consumes
         needs = [] if task.needs is None else task.needs.copy()
 
-        if self.uses is not None:
+        if base_ctor_t is not None:
             if passthrough is None:
                 passthrough = base_ctor_t.passthrough
             if consumes is None:
@@ -328,7 +328,6 @@ class PackageDef(BaseModel):
         if consumes is None:
             consumes = ConsumesE.All
 
-
         return (passthrough, consumes, needs)
 
     def _getParamT(self, session, task, base_t : BaseModel):

dv_flow/mgr/std/create_file.py

@@ -66,6 +66,10 @@ async def CreateFile(runner, input) -> TaskDataResult:
 
         with open(filename, "w") as fp:
             fp.write(input.params.content)
+        memento.name = input.params.filename
+        memento.hash = hashlib.md5(input.params.content.encode()).hexdigest()
+    else:
+        memento = ex_memento
 
     fs = _FileSet(
                 filetype=input.params.type,

dv_flow/mgr/task_def.py

@@ -50,8 +50,9 @@ class PassthroughE(enum.Enum):
 
 
 class StrategyDef(BaseModel):
-    matrix : Dict[str,List[Any]] = dc.Field(
-        default_factory=dict,
+    chain: Union[bool, None] = dc.Field(default=None)
+    matrix : Union[Dict[str,List[Any]],None] = dc.Field(
+        default=None,
         description="Matrix of parameter values to explore")
 
 class TaskDef(BaseModel):
@@ -107,5 +108,7 @@ class TaskDef(BaseModel):
             name=self.name,
             type=self.type,
             depends=self.depends.copy())
-        return ret  
+        return ret 
+
+TaskDef.model_rebuild()
 

dv_flow/mgr/task_graph_builder.py

@@ -203,13 +203,21 @@ class TaskGraphBuilder(object):
         if ctxt.rundir is None or ctxt.rundir == RundirE.Unique:
             self._rundir_s.pop()
 
-    def mkTaskGraph(self, task : str) -> TaskNode:
+    def mkTaskGraph(self, task : str, rundir=None) -> TaskNode:
         self._pkg_s.clear()
         self._task_m.clear()
 
-        return self._mkTaskGraph(task, self.rundir)
+        if rundir is not None:
+            self._rundir_s.append(rundir)
+
+        ret = self._mkTaskGraph(task)
+
+        if rundir is not None:
+            self._rundir_s.pop()
+
+        return ret
         
-    def _mkTaskGraph(self, task : str, parent_rundir : str) -> TaskNode:
+    def _mkTaskGraph(self, task : str) -> TaskNode:
 
         elems = task.split(".")
 
@@ -224,8 +232,6 @@ class TaskGraphBuilder(object):
         else:
             pkg_spec = PackageSpec(pkg_name)
 
-        rundir = os.path.join(parent_rundir, pkg_name, task_name)
-
         self._logger.debug("pkg_spec: %s" % str(pkg_spec))
         self._pkg_spec_s.append(pkg_spec)
         pkg = self.getPackage(pkg_spec)
@@ -243,7 +249,7 @@ class TaskGraphBuilder(object):
             need_fullname = self._resolveNeedRef(need_def)
             self._logger.debug("Searching for qualifed-name task %s" % need_fullname)
             if not need_fullname in self._task_m.keys():
-                need_t = self._mkTaskGraph(need_fullname, rundir)
+                need_t = self._mkTaskGraph(need_fullname)
                 self._task_m[need_fullname] = need_t
             needs.append(self._task_m[need_fullname])
 
@@ -258,7 +264,7 @@ class TaskGraphBuilder(object):
             params=params,
             name=task,
             needs=needs)
-        task.rundir = rundir
+#        task.rundir = rundir
         
         self._task_m[task.name] = task
 
@@ -359,7 +365,7 @@ class TaskGraphBuilder(object):
                 need_fullname = self._resolveNeedRef(need_def)
                 self._logger.debug("Searching for qualifed-name task %s" % need_fullname)
                 if not need_fullname in self._task_m.keys():
-                    need_t = self._mkTaskGraph(need_fullname, self.rundir)
+                    need_t = self._mkTaskGraph(need_fullname)
                     self._task_m[need_fullname] = need_t
                 needs.append(self._task_m[need_fullname])
 
@@ -371,13 +377,14 @@ class TaskGraphBuilder(object):
                 name=name, 
                 srcdir=srcdir, 
                 needs=needs)
+            ret.rundir = self.get_rundir(name)
         else:
             raise Exception("Failed to find ctor for task %s" % task_t)
         self._pkg_s.pop()
         self._logger.debug("<-- mkTaskNode: %s" % task_t)
         return ret
         
-    def getTaskCtor(self, spec : Union[str,'TaskSpec'], pkg : PackageDef = None) -> 'TaskCtor':
+    def getTaskCtor(self, spec : Union[str,'TaskSpec'], pkg : PackageDef = None) -> 'TaskNodeCtor':
         from .task_def import TaskSpec
         if type(spec) == str:
             spec = TaskSpec(spec)

dv_flow/mgr/task_node.py

@@ -20,6 +20,7 @@
 #*
 #****************************************************************************
 import enum
+import json
 import os
 import sys
 import dataclasses as dc
@@ -27,7 +28,7 @@ import pydantic.dataclasses as pdc
 import logging
 import toposort
 from typing import Any, Callable, ClassVar, Dict, List, Tuple
-from .task_data import TaskDataOutput, TaskDataResult
+from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
 from .param import Param
 
 class RundirE(enum.Enum):
@@ -49,11 +50,11 @@ class TaskNode(object):
     consumes : List[Any] = dc.field(default_factory=list)
     needs : List[Tuple['TaskNode',bool]] = dc.field(default_factory=list)
     rundir : List[str] = dc.field(default=None)
-#    rundir_t : RundirE = dc.field(default=RundirE.Unique)
     output : TaskDataOutput = dc.field(default=None)
     result : TaskDataResult = dc.field(default=None)
     start : float = dc.field(default=None)
     end : float = dc.field(default=None)
+    save_exec_data : bool = dc.field(default=True)
 
     _log : ClassVar = logging.getLogger("TaskNode")
 
@@ -101,6 +102,36 @@ class TaskNode(object):
         self._log.debug("<-- _matches: %s %s" % (self.name, consumed))
         return consumed
     
+    def _save_exec_data(self, rundir, input : TaskDataInput):
+        """Saves execution data to the rundir"""
+        data = {
+            "name": self.name,
+            "srcdir": self.srcdir,
+            "rundir": rundir,
+            "input": input.model_dump(warnings=False),
+            "needs": [need[0].name for need in self.needs],
+            "result": {
+                "status": self.result.status,
+                "changed": self.result.changed,
+                "memento": self.result.memento.model_dump() if self.result.memento else None,
+            },
+            "output": self.output.model_dump(),
+        }
+
+        if isinstance(self.consumes, list):
+            data["consumes"] = self.consumes
+        else:
+            data["consumes"] = str(self.consumes)
+
+        if isinstance(self.passthrough, list):
+            data["passthrough"] = self.passthrough
+        else:
+            data["passthrough"] = str(self.passthrough)
+
+        with open(os.path.join(rundir, "%s.exec_data.json" % self.name), "w") as f:
+            json.dump(data, f, indent=2)
+            f.write("\n")
+    
 
 
 

dv_flow/mgr/task_node_ctor_compound.py

@@ -53,9 +53,10 @@ class TaskNodeCtorCompound(TaskNodeCtor):
             params=params,
             needs=needs)
         # Use the compound task's rundir
-        node.input.rundir = builder.get_rundir()
 
         builder.enter_compound(node, self.task_def.rundir)
+        node.input.rundir = builder.get_rundir()
+        print("input rundir: %s" % str(node.input.rundir))
         builder.addTask("in", node.input)
 
         self._buildSubGraph(builder, node)

dv_flow/mgr/task_node_leaf.py

@@ -172,6 +172,9 @@ class TaskNodeLeaf(TaskNode):
             changed=self.result.changed,
             dep_m=dep_m,
             output=output)
+        
+        if self.save_exec_data:
+            self._save_exec_data(rundir, input)
 
         # TODO: 
         self._log.debug("<-- do_run: %s" % self.name)

{dv_flow_mgr-0.0.1.14147547123a1.dist-info → dv_flow_mgr-0.0.2.14148837747a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.1.14147547123a1
+Version: 0.0.2.14148837747a1
 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.14147547123a1.dist-info → dv_flow_mgr-0.0.2.14148837747a1.dist-info}/RECORD

@@ -7,7 +7,7 @@ dv_flow/mgr/fileset.py,sha256=4izm4-qldWLiZxWDUa5Em0iFizzS-S-O0YU6zvtbUUs,1264
 dv_flow/mgr/fragment_def.py,sha256=AHx3ITbiNbGCzlDk5FM8Iimm0GJnWXDDRAoRC1b41jM,1647
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=9FhOu1hKYKzlD88zehwrI6KAcs1E7TbXDnq4v54dqDQ,1701
-dv_flow/mgr/package_def.py,sha256=pyuwgTszJ9n4r3WXuITSkrJuIoN6RwS6saX-_XmHgGk,20880
+dv_flow/mgr/package_def.py,sha256=iilJPa1zJoF5OkjdtBVro_fFImEbiJqPijFkYltut-o,20881
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=mkAw3DanIxcVWRYeh9lUAfUMkpqDFly_Ku_iobr4ix8,1745
@@ -15,30 +15,30 @@ dv_flow/mgr/param_ref_eval.py,sha256=5yH37oIX6f2qmk7GfRgNT5qZx0jm3CJFgB9lLDZZ1yQ
 dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
 dv_flow/mgr/pkg_rgy.py,sha256=d1nIjRm3ymMNJT-yiMDxCS6bFisTPvLMqh5VrfsHVKM,5404
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
-dv_flow/mgr/task_def.py,sha256=9_VJfY8hfZI7x9LFqDxALurg6oWMQQw6rdsppcjTweM,3669
-dv_flow/mgr/task_graph_builder.py,sha256=J5C9PhVmiYuQRlEXkWVCzsX06rWUgxrWrFc5sIwUhbw,15029
+dv_flow/mgr/task_def.py,sha256=Yf9bkWqSETeFUSbddbpvl2Cu3pyssvhdz0X2jxabniA,3751
+dv_flow/mgr/task_graph_builder.py,sha256=dZ4BBUfy158k8uHfzowpIpwf7lt-vleAmQWl66iu3As,15130
 dv_flow/mgr/task_graph_dot_writer.py,sha256=GxqiYwQJbFgUQdnPCS9vpIYmYFbSXwnXCSbGmjbxC3M,2418
 dv_flow/mgr/task_listener_log.py,sha256=hrJEjSRXXoovDTcD1Cmhi3Spzw7uEJ-WP6tv6JUaa6s,4060
-dv_flow/mgr/task_node.py,sha256=twCozRjXcWWeQXJBSOmKM51qpJMEPr5sj9mMK_QiE6A,3728
+dv_flow/mgr/task_node.py,sha256=7lZKsTbOS0Cuhe-TyPj9Gcuh1a4k3sliRXW81R4UGCg,4851
 dv_flow/mgr/task_node_compound.py,sha256=mNu4nf9hVqu2698ue5fpE3FeAOkvJH0Ke2W9V0G3-As,2975
 dv_flow/mgr/task_node_ctor.py,sha256=COFGvm5PR2B92H3uW1yhDIUCmppo9U4IfOcv_Jrsreo,3952
-dv_flow/mgr/task_node_ctor_compound.py,sha256=WBSdREZEATEN9dbamZo7P3oN87E7wu7r3pcUCLqDRt4,4200
+dv_flow/mgr/task_node_ctor_compound.py,sha256=n2Ad1jtX147cb99HTlLrx_21XUn109bJ18zDXr0pn2Q,4259
 dv_flow/mgr/task_node_ctor_compound_proxy.py,sha256=D8x54nD8Pd-2-_mr1syhqVeSFfIVf100ldi3bdzmSfI,2073
 dv_flow/mgr/task_node_ctor_def_base.py,sha256=_8QQHKDkONio_ve0Z409yxC0AMO8ocNBPDjRiNED1FI,1503
 dv_flow/mgr/task_node_ctor_proxy.py,sha256=ViOFJ64JM4-CGFZNl89BghFuKSQ66kZVqSj4v2PA6VA,1906
 dv_flow/mgr/task_node_ctor_task.py,sha256=d49g90TyPCMFR8BuWWqp4ym-MW5vGSdDR0V47Ru28JY,2232
 dv_flow/mgr/task_node_ctor_wrapper.py,sha256=Nb1CVcPHZofnb-iLWDHQWAxlTOdbRrnR9DdSxY8yOec,3626
-dv_flow/mgr/task_node_leaf.py,sha256=iEz-O4943SupriqO0aI5Ai7MIvkFRMkPitN8G85-G9g,7327
+dv_flow/mgr/task_node_leaf.py,sha256=tI9m0GcaKsBccHmZCSTzc6vKyNgXezVB5vC28B75AFg,7416
 dv_flow/mgr/task_output.py,sha256=ZwyvwnYj_gHOEFAEOH3m24Xfc4Cn77hb1j7LkX8_3C4,1086
 dv_flow/mgr/task_params_ctor.py,sha256=BPkbnoCtzhCxc1g8CJ6VimCcm5UAu92PXeDMhQ4lYsQ,1957
 dv_flow/mgr/task_runner.py,sha256=-919VntXAe2XSuFW2dFpgvUre-NkILBnDBbAKBZYn5w,9594
 dv_flow/mgr/type.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/type_def.py,sha256=NDeyplKrPnWwEv4yHkhXEMK9d9j39b5MOeLB-1Mchqo,1095
 dv_flow/mgr/cmds/cmd_graph.py,sha256=Ykw__EdwamDBZZKxQZVbtMtFl7koq5dJMShTBXSM2pk,2672
-dv_flow/mgr/cmds/cmd_run.py,sha256=VL0LU0zYnClQ8Id30sxMN_fHJzQFJsOuj7qDG7GTT60,3198
+dv_flow/mgr/cmds/cmd_run.py,sha256=f0zt2OxGZC50aaDR7wGDH8YBk3rMQoBl8YeRHWcJUD0,3211
 dv_flow/mgr/cmds/cmd_show.py,sha256=CZlgwB3Hcu-6HS-diqnWjCcPPpO-kjIIXU3DgWXvsf4,3773
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
-dv_flow/mgr/std/create_file.py,sha256=wmn5N_mObx_wr2LPdKOVbNmdM71hhs3UXOv6Ap9l3Ts,2726
+dv_flow/mgr/std/create_file.py,sha256=TAUhpXlTmUDUYw4Dw0cI9FPuYI84yCVkoadnWZxi_8U,2888
 dv_flow/mgr/std/exec.py,sha256=UChqa_tAjvdB1NjqTsvlPgFomP8hMsX2rAOPyUonNpk,3896
 dv_flow/mgr/std/fileset.py,sha256=5IxS6T-x0wzA6fdEQcfHZ9kNP8IpH9hfJ3UMhL4A6Iw,3911
 dv_flow/mgr/std/flow.dv,sha256=t8m-urWYhKEAOFhG4wlrMqGHwiWDyO8H-b6-5vNQkBk,3795
@@ -49,9 +49,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=yg9oTPRiO87mkCSOQpOtlG9vyKPQzY3qp4OJkEMbWyY,1443
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=lrEI-Jwb8j4I4yYOn9hq7_7NYbK8leVxLesrHyEWm-E,1879
-dv_flow_mgr-0.0.1.14147547123a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.14147547123a1.dist-info/METADATA,sha256=61gFcfnbRS1QgZKLPgpwMtYTkObC6pF2R5l35Mqz6M8,13336
-dv_flow_mgr-0.0.1.14147547123a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-0.0.1.14147547123a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.14147547123a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.14147547123a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.2.14148837747a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.2.14148837747a1.dist-info/METADATA,sha256=LrYCwf6jPAr1wJkBercc0PQSJ3BUAL0B4SYETCUeWW8,13336
+dv_flow_mgr-0.0.2.14148837747a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-0.0.2.14148837747a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.2.14148837747a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.2.14148837747a1.dist-info/RECORD,,