dv-flow-mgr 0.0.2.14148165289a1__tar.gz → 0.0.2.14148897378a1__tar.gz

{dv_flow_mgr-0.0.2.14148165289a1 → dv_flow_mgr-0.0.2.14148897378a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.2.14148165289a1
+Version: 0.0.2.14148897378a1
 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.14148165289a1 → dv_flow_mgr-0.0.2.14148897378a1}/pyproject.toml

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

{dv_flow_mgr-0.0.2.14148165289a1 → dv_flow_mgr-0.0.2.14148897378a1}/src/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-0.0.2.14148165289a1 → dv_flow_mgr-0.0.2.14148897378a1}/src/dv_flow/mgr/package_def.py

@@ -318,7 +318,6 @@ class PackageDef(BaseModel):
         needs = [] if task.needs is None else task.needs.copy()
 
         if base_ctor_t is not None:
-            print("-- uses")
             if passthrough is None:
                 passthrough = base_ctor_t.passthrough
             if consumes is None:

{dv_flow_mgr-0.0.2.14148165289a1 → dv_flow_mgr-0.0.2.14148897378a1}/src/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):

{dv_flow_mgr-0.0.2.14148165289a1 → dv_flow_mgr-0.0.2.14148897378a1}/src/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):
@@ -203,11 +199,19 @@ 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)
+        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) -> TaskNode:
 
@@ -241,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])
 
@@ -357,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-0.0.2.14148165289a1 → dv_flow_mgr-0.0.2.14148897378a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.2.14148165289a1
+Version: 0.0.2.14148897378a1
 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.14148165289a1 → dv_flow_mgr-0.0.2.14148897378a1}/tests/unit/test_smoke.py

@@ -6,7 +6,7 @@ import pytest
 import jq
 from typing import List
 import yaml
-from dv_flow.mgr import FileSet, PackageDef, TaskData, TaskGraphBuilder
+from dv_flow.mgr import TaskSetRunner, PackageDef, TaskData, TaskGraphBuilder
 from pydantic import BaseModel
 from shutil import copytree
 
@@ -26,7 +26,9 @@ package:
 
     pkg_def = PackageDef.loads(flowdv)
     builder = TaskGraphBuilder(pkg_def, os.getcwd())
-    task = builder.mkTaskGraph("my_pkg.entry")
+    task = builder.mkTaskGraph("my_pkg.entry", rundir="mk_pkg.entry")
+
+    assert len(task.rundir) == 1
 
 def test_jq():
     data = [