dv-flow-mgr 0.0.1.13777985638a1__py3-none-any.whl → 0.0.1.13797938654a1__py3-none-any.whl

dv_flow/mgr/std/fileset.py

@@ -82,6 +82,8 @@ async def FileSet(runner, input) -> TaskDataResult:
     else:
         changed = True
 
+    _log.debug("<-- FileSet(%s) changed=%s" % (input.name, changed))
+
     return TaskDataResult(
         memento=memento,
         changed=changed,

dv_flow/mgr/task_listener_log.py

@@ -1,4 +1,5 @@
 import dataclasses as dc
+from datetime import datetime
 from rich.console import Console
 
 @dc.dataclass
@@ -11,12 +12,20 @@ class TaskListenerLog(object):
         if reason == 'enter':
             self.level += 1
             if not self.quiet:
-                self.console.print("[green]>[%d][/green] Task %s" % (self.level, task.name))
+                self.console.print("[green]>> [%d][/green] Task %s" % (self.level, task.name))
         elif reason == 'leave':
             if self.quiet:
                 if task.result.changed:
                     self.console.print("[green]Done:[/green] %s" % (task.name,))
             else:
+                delta_s = None
+                if task.start is not None and task.end is not None:
+                    delta = task.end - task.start
+                    if delta.total_seconds() > 1:
+                        delta_s = " %0.2fs" % delta.total_seconds()
+                    else:
+                        delta_s = " %0.2fmS" % (1000*delta.total_seconds())
+
                 sev_pref_m = {
                     "info": "[blue]I[/blue]",
                     "warn": "[yellow]W[/yellow]",
@@ -38,9 +47,13 @@ class TaskListenerLog(object):
                         else:
                             self.console.print("    %s" % m.loc.path)
                 if task.result.status == 0:
-                    self.console.print("[green]<[%d][/green] Task %s" % (self.level, task.name))
+                    self.console.print("[green]<< [%d][/green] Task %s%s%s" % (
+                        self.level, 
+                        task.name,
+                        ("" if task.result.changed else " (up-to-date)"),
+                        (delta_s if delta_s is not None else "")))
                 else:
-                    self.console.print("[red]<[%d][/red] Task %s" % (self.level, task.name))
+                    self.console.print("[red]<< [%d][/red] Task %s" % (self.level, task.name))
             self.level -= 1
         else:
             self.console.print("[red]-[/red] Task %s" % task.name)

dv_flow/mgr/task_node.py

@@ -29,6 +29,8 @@ class TaskNode(object):
     rundir : str = dc.field(default=None)
     output : TaskDataOutput = dc.field(default=None)
     result : TaskDataResult = dc.field(default=None)
+    start : float = dc.field(default=None)
+    end : float = dc.field(default=None)
 
     _log : ClassVar = logging.getLogger("TaskNode")
 
@@ -45,6 +47,8 @@ class TaskNode(object):
         for dep in self.needs:
             changed |= dep.changed
 
+        self.rundir = rundir
+
         # TODO: Form dep-map from inputs
 
         dep_m = {}

dv_flow/mgr/task_runner.py

@@ -4,6 +4,7 @@ import os
 import re
 import dataclasses as dc
 import logging
+from datetime import datetime
 from toposort import toposort
 from typing import Any, Callable, ClassVar, List, Tuple, Union
 from .task_data import TaskDataInput, TaskDataOutput, TaskDataResult
@@ -99,6 +100,7 @@ class TaskSetRunner(TaskRunner):
                         for i in range(len(active_task_l)):
                             if active_task_l[i][1] == d:
                                 tt = active_task_l[i][0]
+                                tt.end = datetime.now()
                                 if tt.result.memento is not None:
                                     dst_memento[tt.name] = tt.result.memento.model_dump()
                                 else:
@@ -122,6 +124,7 @@ class TaskSetRunner(TaskRunner):
                         os.makedirs(rundir, exist_ok=True)
 
                     self._notify(t, "enter")
+                    t.start = datetime.now()
                     coro = asyncio.Task(t.do_run(
                         self,
                         rundir,
@@ -139,6 +142,7 @@ class TaskSetRunner(TaskRunner):
                 coros = list(at[1] for at in active_task_l)
                 res = await asyncio.gather(*coros)
                 for tt in active_task_l:
+                    tt[0].end = datetime.now()
                     if tt[0].result.memento is not None:
                         dst_memento[tt[0].name] = tt[0].result.memento.model_dump()
                     else:

{dv_flow_mgr-0.0.1.13777985638a1.dist-info → dv_flow_mgr-0.0.1.13797938654a1.dist-info}/METADATA

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

@@ -23,25 +23,25 @@ dv_flow/mgr/task_graph_builder.py,sha256=AOltPyzd2Q9B67m0MyL59RPu3i2d5QrX3K-0gKW
 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=Aq48AKEJ2fP9SXIXuzC0hszEi6W6mnuAR8dV91mmLaE,1932
+dv_flow/mgr/task_listener_log.py,sha256=NvqzGBEdf3EV8voy1sjA_prDeyMWJ77-730v8_fMof0,2532
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
-dv_flow/mgr/task_node.py,sha256=K65jWd2GYZH1oYlfkc5sx0eGzDbWdElA5EQXCremH-Y,12651
+dv_flow/mgr/task_node.py,sha256=uuJGDgSySUyt2hz-I78w47fqpq4cIYtzrVj4RdKr_Cg,12765
 dv_flow/mgr/task_output.py,sha256=dkJhhNRFGFQSkVsw_bGirK0_0ghTxBYq1LjRMZCVWnA,245
 dv_flow/mgr/task_params_ctor.py,sha256=aXgB8o9xFPjaEjGW_xYkEC0N0apzGzGUPDj7g2ZLvus,1112
-dv_flow/mgr/task_runner.py,sha256=tWderVo2MqCgPC0A-HcrVQuAZ9Xx77EmJ0i3e-bmPfo,7621
+dv_flow/mgr/task_runner.py,sha256=SHbhGfuOUmlbk-nZDDuk9FX7syWWcgmCuOZ2LwG5UFM,7799
 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
 dv_flow/mgr/cmds/cmd_run.py,sha256=w1KdnS5Skg4RH1xTB1RZP7gAElZMNcRuOhz3G98n9uk,2467
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/exec.py,sha256=ETx9xSxhdCD_iw6pcmhrafDCJ-41AneyEAPwQf3q-3w,452
-dv_flow/mgr/std/fileset.py,sha256=AOLARYXjJEmKAextB_4P4eRu2PHNPex961eq16QtgCc,3006
+dv_flow/mgr/std/fileset.py,sha256=nW5Cg4IyCs-ccKKsIxA5W5aZvaluFk6LXDyFh9Jixcs,3076
 dv_flow/mgr/std/flow.dv,sha256=DpDTrRBfbIt4cJKLHqk_l6_nPkeFDKLVa5Ic4FZodNM,1587
 dv_flow/mgr/std/message.py,sha256=T8Ye44784rD6CT2qIAP5SD7sKPdAlGMFimc4IaPCxxE,200
 dv_flow/mgr/std/task_null.py,sha256=UKwUnqwFPBY8BO44ZAPcgehQB59kHZFa1qyZc1TwUqE,196
-dv_flow_mgr-0.0.1.13777985638a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13777985638a1.dist-info/METADATA,sha256=ueDigzSUXzQYrN4x2qAuEAY4NoC7ljqfOPzBwDOgEqE,13314
-dv_flow_mgr-0.0.1.13777985638a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-dv_flow_mgr-0.0.1.13777985638a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13777985638a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13777985638a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13797938654a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13797938654a1.dist-info/METADATA,sha256=6evEmYV2TBYSFz0p38MsXK8JKIkJSbgoqLPnQ4L3388,13314
+dv_flow_mgr-0.0.1.13797938654a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+dv_flow_mgr-0.0.1.13797938654a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13797938654a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13797938654a1.dist-info/RECORD,,