dv-flow-mgr 0.0.1.13730579777a1__tar.gz → 0.0.1.13777805368a1__tar.gz

{dv_flow_mgr-0.0.1.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13730579777a1
+Version: 0.0.1.13777805368a1
 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.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "0.0.1.13730579777a1"
+version = "0.0.1.13777805368a1"
 dependencies = [
     'jq',
     'pydantic',

{dv_flow_mgr-0.0.1.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/src/dv_flow/mgr/__main__.py

@@ -56,7 +56,7 @@ def main():
         }
         logging.basicConfig(level=opt_m[args.log_level])
 
-    args.func(args)
+    return args.func(args)
 
 if __name__ == "__main__":
     main()

{dv_flow_mgr-0.0.1.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/src/dv_flow/mgr/cmds/cmd_run.py

@@ -76,4 +76,6 @@ class CmdRun(object):
 
         asyncio.run(runner.run(tasks))
 
+        return runner.status
+
 

{dv_flow_mgr-0.0.1.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/src/dv_flow/mgr/pkg_rgy.py

@@ -89,6 +89,7 @@ class PkgRgy(object):
         self._log.debug("<-- registerPackage %s" % pkg_def.name)
 
     def _discover_plugins(self):
+        self._log.debug("--> discover_plugins")
         # Register built-in package
         self._pkg_m["std"] = (os.path.join(os.path.dirname(__file__), "std/flow.dv"), None)
 
@@ -102,6 +103,7 @@ class PkgRgy(object):
             from importlib.metadata import entry_points
 
         discovered_plugins = entry_points(group='dv_flow.mgr')
+        self._log.debug("discovered_plugins: %s" % str(discovered_plugins))
         for p in discovered_plugins:
             try:
                 mod = p.load()
@@ -110,6 +112,7 @@ class PkgRgy(object):
                     pkg_m = mod.dvfm_packages()
                     
                     for name,path in pkg_m.items():
+                        self._log.debug("Registering package %s: %s" % (name, path))
                         if name in self._pkg_m.keys():
                             raise Exception("Package %s already registered using path %s. Conflicting path: %s" % (
                                 name, self._pkg_m[name][0], path))
@@ -121,6 +124,7 @@ class PkgRgy(object):
         # self._pkgs = {}
         # for pkg in self._load_pkg_list():
         #     self._pkgs[pkg.name] = pkg
+        self._log.debug("<-- discover_plugins")
 
     def copy(self):
         ret = PkgRgy()

{dv_flow_mgr-0.0.1.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/src/dv_flow/mgr/std/fileset.py

@@ -43,6 +43,8 @@ async def FileSet(runner, input) -> TaskDataResult:
 
         _log.debug("glob_root: %s" % glob_root)
 
+        # TODO: throw error if 'type' is not set
+
         fs = _FileSet(
                 filetype=input.params.type,
                 src=input.name, 

dv_flow_mgr-0.0.1.13777805368a1/src/dv_flow/mgr/task_listener_log.py

@@ -0,0 +1,50 @@
+import dataclasses as dc
+from rich.console import Console
+
+@dc.dataclass
+class TaskListenerLog(object):
+    console : Console = dc.field(default_factory=Console)
+    level : int = 0
+    quiet : bool = False
+
+    def event(self, task : 'Task', reason : 'Reason'):
+        if reason == 'enter':
+            self.level += 1
+            if not self.quiet:
+                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:
+                sev_pref_m = {
+                    "info": "[blue]I[/blue]",
+                    "warn": "[yellow]W[/yellow]",
+                    "error": "[red]E[/red]",
+                }
+                for m in task.result.markers:
+                    msg = "  %s %s: %s" % (
+                        sev_pref_m[m.severity], 
+                        task.name,
+                        m.msg)
+
+                    self.console.print(msg)
+
+                    if m.loc is not None:
+                        if m.loc.line != -1 and m.loc.pos != -1:
+                            self.console.print("    %s:%d:%d" % (m.loc.path, m.loc.line, m.loc.pos))
+                        elif m.loc.line != -1:
+                            self.console.print("    %s:%d" % (m.loc.path, m.loc.line))
+                        else:
+                            self.console.print("    %s" % m.loc.path)
+
+                        pass
+                if task.result.status == 0:
+                    self.console.print("[green]<[%d][/green] Task %s" % (self.level, task.name))
+                else:
+                    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)
+        pass
+

{dv_flow_mgr-0.0.1.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/src/dv_flow/mgr/task_runner.py

@@ -38,6 +38,7 @@ class TaskRunner(object):
 @dc.dataclass
 class TaskSetRunner(TaskRunner):
     nproc : int = 8
+    status : int = 0
 
     _anon_tid : int = 1
 
@@ -87,6 +88,7 @@ class TaskSetRunner(TaskRunner):
 
         active_task_l = []
         done_task_s = set()
+        self.status = 0
         for active_s in order:
             done = True
             for t in active_s:
@@ -101,11 +103,13 @@ class TaskSetRunner(TaskRunner):
                                     dst_memento[tt.name] = tt.result.memento.model_dump()
                                 else:
                                     dst_memento[tt.name] = None
+                                status |= tt.result.status 
                                 self._notify(tt, "leave")
                                 done_task_s.add(tt)
                                 active_task_l.pop(i)
                                 break
-                if t not in done_task_s:
+
+                if self.status == 0 and t not in done_task_s:
                     memento = src_memento.get(t.name, None)
                     dirname = t.name
                     invalid_chars_pattern = r'[\/:*?"<>|#%&{}\$\\!\'`;=@+]'
@@ -123,8 +127,13 @@ class TaskSetRunner(TaskRunner):
                         rundir,
                         memento)) 
                     active_task_l.append((t, coro))
+
+                if self.status != 0:
+                    self._log.debug("Exiting due to status: %d", self.status)
+                    break
                
-            # Now, wait for tasks to complete
+            # All pending tasks in the task-group have been launched
+            # Wait for them to all complete
             if len(active_task_l):
                 # TODO: Shouldn't gather here -- reach to each completion
                 coros = list(at[1] for at in active_task_l)
@@ -134,8 +143,13 @@ class TaskSetRunner(TaskRunner):
                         dst_memento[tt[0].name] = tt[0].result.memento.model_dump()
                     else:
                         dst_memento[tt[0].name] = None
+                    self.status |= tt[0].result.status
                     self._notify(tt[0], "leave")
                 active_task_l.clear()
+            
+            if self.status != 0:
+                self._log.debug("Exiting due to status: %d", self.status)
+                break
 
         with open(os.path.join(self.rundir, "cache", "mementos.json"), "w") as f:
             json.dump(dst_memento, f)
@@ -145,10 +159,6 @@ class TaskSetRunner(TaskRunner):
         else:
             return task.output
 
-
-
-        pass
-
     def _buildDepMap(self, dep_m, task : TaskNode):
         if task.name is None:
             task.name = "anon_%d" % self._anon_tid
@@ -176,6 +186,7 @@ class SingleTaskRunner(TaskRunner):
 #            print("Field: %s" % field.name)
 
         input = TaskDataInput(
+            name=task.name,
             changed=changed,
             srcdir=task.srcdir,
             rundir=self.rundir,

{dv_flow_mgr-0.0.1.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13730579777a1
+Version: 0.0.1.13777805368a1
 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.13730579777a1 → dv_flow_mgr-0.0.1.13777805368a1}/src/dv_flow_mgr.egg-info/SOURCES.txt

@@ -78,6 +78,7 @@ tests/unit/test_expr_eval.py
 tests/unit/test_expr_parser.py
 tests/unit/test_fileset.py
 tests/unit/test_imports.py
+tests/unit/test_markers.py
 tests/unit/test_parse.py
 tests/unit/test_pyclass.py
 tests/unit/test_pytask_smoke.py

dv_flow_mgr-0.0.1.13777805368a1/tests/unit/test_markers.py

@@ -0,0 +1,45 @@
+import asyncio
+import pytest
+from typing import List, Union
+import dataclasses as dc
+import pydantic.dataclasses as pdc
+from pydantic import BaseModel
+from dv_flow.mgr.param import Param, ParamT
+from dv_flow.mgr.task import Task
+from dv_flow.mgr.task_data import TaskDataResult, TaskMarker, TaskMarkerLoc
+from dv_flow.mgr.task_node import task as t_decorator
+from dv_flow.mgr.task_node import task
+from dv_flow.mgr.task_runner import SingleTaskRunner, TaskSetRunner
+from dv_flow.mgr.task_listener_log import TaskListenerLog
+
+def test_smoke_1(tmpdir):
+
+    class Params(BaseModel):
+        p1 : str = None
+
+    called = False
+
+    @task(Params)
+    async def MyTask(runner, input):
+            nonlocal called
+            called = True
+            print("Hello from run")
+            return TaskDataResult(
+                 status=1,
+                 markers=[
+                      TaskMarker(msg="testing", severity="info",
+                      loc=TaskMarkerLoc(
+                          path="file1",
+                          line=1,
+                          pos=1
+                      ))
+                 ]
+            )
+
+    task1 = MyTask("task1", srcdir="srcdir", p1="p1")
+    runner = TaskSetRunner("rundir")
+    runner.add_listener(TaskListenerLog().event)
+
+    result = asyncio.run(runner.run(task1))
+
+    assert called

dv_flow_mgr-0.0.1.13730579777a1/src/dv_flow/mgr/task_listener_log.py

@@ -1,27 +0,0 @@
-import dataclasses as dc
-from rich.console import Console
-
-@dc.dataclass
-class TaskListenerLog(object):
-    console : Console = dc.field(default_factory=Console)
-    level : int = 0
-    quiet : bool = False
-
-    def event(self, task : 'Task', reason : 'Reason'):
-        if reason == 'enter':
-            self.level += 1
-            if not self.quiet:
-                self.console.print("[green]>[%d][/green] Task %s" % (self.level, task.name))
-        elif reason == 'leave':
-            for m in task.result.markers:
-                print("  %s" % m)
-            if self.quiet:
-                if task.result.changed:
-                    self.console.print("[green]Done:[/green] %s" % (task.name,))
-            else:
-                self.console.print("[green]<[%d][/green] Task %s" % (self.level, task.name))
-            self.level -= 1
-        else:
-            self.console.print("[red]-[/red] Task %s" % task.name)
-        pass
-