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

dv_flow/mgr/task_graph_builder.py

@@ -192,10 +192,6 @@ class TaskGraphBuilder(object):
         if task is None and name in self._task_m.keys():
             task = self._task_m[name]
         
-        # if task is None:
-        #     # TODO: Look for a def that hasn't yet been constructed
-        #     task = self._mkTaskGraph(name, self.rundir)
-
         return task
 
     def leave_compound(self, task : TaskNode):
@@ -249,7 +245,11 @@ 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():
+                # Go back to the root from a rundir perspective
+                rundir_s = self._rundir_s
+                self._rundir_s = [need_fullname]
                 need_t = self._mkTaskGraph(need_fullname)
+                self._rundir_s = rundir_s
                 self._task_m[need_fullname] = need_t
             needs.append(self._task_m[need_fullname])
 
@@ -365,7 +365,10 @@ 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():
+                    rundir_s = self._rundir_s
+                    self._rundir_s = [need_fullname]
                     need_t = self._mkTaskGraph(need_fullname)
+                    self._rundir_s = rundir_s
                     self._task_m[need_fullname] = need_t
                 needs.append(self._task_m[need_fullname])
 

dv_flow/mgr/task_node.py

@@ -29,6 +29,7 @@ import logging
 import toposort
 from typing import Any, Callable, ClassVar, Dict, List, Tuple
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
+from .task_run_ctxt import TaskRunCtxt
 from .param import Param
 
 class RundirE(enum.Enum):
@@ -102,7 +103,7 @@ class TaskNode(object):
         self._log.debug("<-- _matches: %s %s" % (self.name, consumed))
         return consumed
     
-    def _save_exec_data(self, rundir, input : TaskDataInput):
+    def _save_exec_data(self, rundir, ctxt : TaskRunCtxt, input : TaskDataInput):
         """Saves execution data to the rundir"""
         data = {
             "name": self.name,
@@ -110,6 +111,7 @@ class TaskNode(object):
             "rundir": rundir,
             "input": input.model_dump(warnings=False),
             "needs": [need[0].name for need in self.needs],
+            "commands": [cmd.dump_model() for cmd in ctxt._exec_info],
             "result": {
                 "status": self.result.status,
                 "changed": self.result.changed,

dv_flow/mgr/task_node_leaf.py

@@ -9,6 +9,7 @@ from typing import Any, Callable, ClassVar, Dict, List, Tuple
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
 from .task_def import ConsumesE, PassthroughE
 from .task_node import TaskNode
+from .task_run_ctxt import TaskRunCtxt
 from .param_ref_eval import ParamRefEval
 from .param import Param
 
@@ -114,11 +115,15 @@ class TaskNodeLeaf(TaskNode):
             params=self.params,
             inputs=inputs,
             memento=memento)
+        
+        ctxt = TaskRunCtxt(runner=self, rundir=input.rundir)
 
         self._log.debug("--> Call task method %s" % str(self.task))
         self.result : TaskDataResult = await self.task(self, input)
         self._log.debug("<-- Call task method %s" % str(self.task))
 
+        self.result.markers.extend(ctxt._markers)
+
         output=self.result.output.copy()
         for i,out in enumerate(output):
             out.src = self.name
@@ -174,7 +179,7 @@ class TaskNodeLeaf(TaskNode):
             output=output)
         
         if self.save_exec_data:
-            self._save_exec_data(rundir, input)
+            self._save_exec_data(rundir, ctxt, input)
 
         # TODO: 
         self._log.debug("<-- do_run: %s" % self.name)

dv_flow/mgr/task_run_ctxt.py

@@ -0,0 +1,52 @@
+import asyncio
+import dataclasses as dc
+from pydantic import BaseModel
+import pydantic.dataclasses as pdc
+import os
+from typing import List
+from .task_data import TaskMarker, SeverityE, TaskMarkerLoc
+
+class ExecInfo(BaseModel):
+    cmd : List[str] = pdc.Field(default_factory=list)
+    status : int = pdc.Field(default=0)
+
+@dc.dataclass
+class TaskRunCtxt(object):
+    runner : 'TaskRunner'
+    rundir : str
+    _markers : List[TaskMarker] = dc.field(default_factory=list)
+    _exec_info : List[ExecInfo] = dc.field(default_factory=list)
+
+    async def exec(self, 
+                   cmd : List[str],
+                   logfile=None,
+                   logfilter=None,
+                   cwd=None,
+                   env=None):
+        if logfile is None:
+            logfile = "cmd_%d.log" % (self._exec_info.__len__() + 1)
+
+        fp = open(os.path.join(self.rundir, logfile), "w")
+        proc = await asyncio.create_subprocess_exec(
+            *cmd,
+            stdout=fp,
+            stderr=asyncio.subprocess.STDOUT,
+            cwd=(cwd if cwd is not None else self.rundir),
+            env=env)
+        fp.close()
+        
+        status = await proc.wait()
+
+        self._exec_info.append(ExecInfo(cmd=cmd, status=status))
+
+        if status != 0:
+            self.error_marker("Command failed: %s" % " ".join(cmd))
+
+    def marker(self, msg : str, severity : SeverityE, loc : TaskMarkerLoc=None):
+        if loc is not None:
+            self._markers.append(TaskMarker(msg=msg, severity=severity, loc=loc))
+        else:
+            self._markers.append(TaskMarker(msg=msg, severity=severity))
+
+    def error(self, msg : str, loc : TaskMarkerLoc=None):
+        self.marker(msg=msg, severity=SeverityE.Error, loc=loc)

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

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

@@ -16,10 +16,10 @@ 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=Yf9bkWqSETeFUSbddbpvl2Cu3pyssvhdz0X2jxabniA,3751
-dv_flow/mgr/task_graph_builder.py,sha256=dZ4BBUfy158k8uHfzowpIpwf7lt-vleAmQWl66iu3As,15130
+dv_flow/mgr/task_graph_builder.py,sha256=Z14ySv1SFanFovR8HePwKglyFSzc6JsS8Z4RLmggM6c,15316
 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=7lZKsTbOS0Cuhe-TyPj9Gcuh1a4k3sliRXW81R4UGCg,4851
+dv_flow/mgr/task_node.py,sha256=4LlMRQ30ZdIk-nZ0FCTfyrusrQWF9LQ1g3vhgMJXMcc,4981
 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=n2Ad1jtX147cb99HTlLrx_21XUn109bJ18zDXr0pn2Q,4259
@@ -28,9 +28,10 @@ dv_flow/mgr/task_node_ctor_def_base.py,sha256=_8QQHKDkONio_ve0Z409yxC0AMO8ocNBPD
 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=tI9m0GcaKsBccHmZCSTzc6vKyNgXezVB5vC28B75AFg,7416
+dv_flow/mgr/task_node_leaf.py,sha256=f7LvifhUCRs94t_HpqJWyBygmjiN3KWgNjv-FaALj1s,7582
 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_run_ctxt.py,sha256=ZyO0EzhWZ6uOAYhlByQQoYizyQWmJBSt8UhobTSb6n0,1728
 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
@@ -49,9 +50,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.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,,
+dv_flow_mgr-0.0.2.14149088756a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.2.14149088756a1.dist-info/METADATA,sha256=nHqGvVQydbFlAzyHjJhoWc51_cqtJzbUbjkWFVerQus,13336
+dv_flow_mgr-0.0.2.14149088756a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-0.0.2.14149088756a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.2.14149088756a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.2.14149088756a1.dist-info/RECORD,,