dv-flow-mgr 1.0.0.14370600369a1__tar.gz → 1.0.0.14389547107a1__tar.gz

{dv_flow_mgr-1.0.0.14370600369a1 → dv_flow_mgr-1.0.0.14389547107a1}/PKG-INFO

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

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

{dv_flow_mgr-1.0.0.14370600369a1 → dv_flow_mgr-1.0.0.14389547107a1}/src/dv_flow/mgr/package_loader.py

@@ -605,7 +605,7 @@ class PackageLoader(object):
                 rundir = base_t.rundir
 
         if passthrough is None:
-            passthrough = PassthroughE.No
+            passthrough = PassthroughE.Unused
         if consumes is None:
             consumes = ConsumesE.All
 

{dv_flow_mgr-1.0.0.14370600369a1 → dv_flow_mgr-1.0.0.14389547107a1}/src/dv_flow/mgr/task_def.py

@@ -114,9 +114,6 @@ class TaskDef(BaseModel):
         description="Shell to use for shell-based implementation")
     strategy : StrategyDef = dc.Field(
         default=None)
-    tasks: Union[List['TaskDef'], TasksBuilder, None] = dc.Field(
-        default=None,
-        description="Sub-tasks")
     desc : str = dc.Field(
         default="",
         title="Task description",

{dv_flow_mgr-1.0.0.14370600369a1 → dv_flow_mgr-1.0.0.14389547107a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -215,38 +215,6 @@ class TaskGraphBuilder(object):
 
         # return ret
         
-    def _mkTaskGraph(self, task : str) -> TaskNode:
-        if task in self.root_pkg.task_m.keys():
-            task_t = self.root_pkg.task_m[task]
-        else:
-            pass
-
-        if task_t is None:
-            raise Exception("Failed to find task %s" % task)
-
-        ctor = self._getTaskCtor(task_t)
-
-        params = ctor.mkTaskParams()
-
-        needs = []
-
-        for need in task_t.needs:
-            need_n = self.findTask(need.name)
-            if need_n is None:
-                raise Exception("Failed to find need %s" % need.name)
-            needs.append(need_n)
-
-        task = ctor.mkTaskNode(
-            builder=self,
-            params=params,
-            name=task,
-            needs=needs)
-        task.rundir = self.get_rundir(task.name)
-#        task.rundir = rundir
-        
-        self._task_node_m[task.name] = task
-
-        return task
     
     def mkTaskNode(self, task_t, name=None, srcdir=None, needs=None, **kwargs):
         self._log.debug("--> mkTaskNode: %s" % task_t)
@@ -337,10 +305,7 @@ class TaskGraphBuilder(object):
 
         # Now, link up the needs
         self._log.debug("--> processing needs")
-        for n in task.needs:
-            self._log.debug("-- need %s" % n.name)
-            nn = self._getTaskNode(n.name)
-            node.needs.append((nn, False))
+        self._gatherNeeds(task, node)
         self._log.debug("<-- processing needs")
 
         if task.rundir == RundirE.Unique:
@@ -375,10 +340,7 @@ class TaskGraphBuilder(object):
         self.leave_rundir()
 
         self._log.debug("--> processing needs")
-        for need in task.needs:
-            self._log.debug("-- need: %s" % need.name)
-            nn = self._getTaskNode(need.name)
-            node.input.needs.append((nn, False))
+        self._gatherNeeds(task, node.input)
         self._log.debug("<-- processing needs")
 
         # TODO: handle strategy
@@ -429,6 +391,17 @@ class TaskGraphBuilder(object):
 
         return node
 
+    def _gatherNeeds(self, task_t, node):
+        self._log.debug("--> _gatherNeeds %s" % task_t.name)
+        if task_t.uses is not None:
+            self._gatherNeeds(task_t.uses, node)
+
+        for need in task_t.needs:
+            need_n = self._getTaskNode(need.name)
+            if need_n is None:
+                raise Exception("Failed to find need %s" % need.name)
+            node.needs.append((need_n, False))
+        self._log.debug("<-- _gatherNeeds %s" % task_t.name)
         
     def getTaskCtor(self, spec : Union[str,'TaskSpec'], pkg : PackageDef = None) -> 'TaskNodeCtor':
         from .task_def import TaskSpec

{dv_flow_mgr-1.0.0.14370600369a1 → dv_flow_mgr-1.0.0.14389547107a1}/src/dv_flow/mgr/task_node_leaf.py

@@ -170,7 +170,9 @@ class TaskNodeLeaf(TaskNode):
                 for need,block in self.needs:
                     if not block:
                         output.extend(need.output.output)
-            else:
+            elif self.consumes == ConsumesE.All:
+                self._log.debug("All inputs are consumed, so not propagating any")
+            elif isinstance(self.consumes, list):
                 # Filter out parameter sets that were consumed
                 self._log.debug("Propagating non-consumed input parameters to output")
                 self._log.debug("consumes: %s" % str(self.consumes))

{dv_flow_mgr-1.0.0.14370600369a1 → dv_flow_mgr-1.0.0.14389547107a1}/src/dv_flow_mgr.egg-info/PKG-INFO

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

@@ -106,6 +106,7 @@ tests/unit/task_listener_test.py
 tests/unit/test_compound_task.py
 tests/unit/test_data_merge.py
 tests/unit/test_dataflow.py
+tests/unit/test_deps.py
 tests/unit/test_expr_eval.py
 tests/unit/test_expr_parser.py
 tests/unit/test_fileset.py

dv_flow_mgr-1.0.0.14389547107a1/tests/unit/test_deps.py

@@ -0,0 +1,63 @@
+import os
+import asyncio
+import pytest
+from dv_flow.mgr import TaskGraphBuilder, PackageLoader
+from dv_flow.mgr.task_runner import TaskSetRunner
+from dv_flow.mgr.task_listener_log import TaskListenerLog
+from .task_listener_test import TaskListenerTest
+from .marker_collector import MarkerCollector
+
+def test_glob_sys(tmpdir):
+    flow_dv = """
+package:
+  name: p1
+
+  tasks:
+  - name: glob1
+    uses: std.FileSet
+    with:
+      type: systemVerilogSource
+      include: "*.sv"
+      incdirs: ["srcdir"]
+  - name: glob2
+    uses: std.FileSet
+    with:
+      type: verilogSource
+      include: "*.v"
+      incdirs: ["srcdir"]
+  - name: glob_base
+    passthrough: all
+    needs: [glob1]
+  - name: glob_uses
+    uses: glob_base
+    needs: [glob2]
+"""
+
+    rundir = os.path.join(tmpdir)
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+    
+    with open(os.path.join(rundir, "top.sv"), "w") as fp:
+        fp.write("\n")
+    with open(os.path.join(rundir, "top.v"), "w") as fp:
+        fp.write("\n")
+    
+    pkg_def = PackageLoader().load(os.path.join(tmpdir, "flow.dv"))
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=os.path.join(tmpdir, "rundir"))
+    runner = TaskSetRunner(rundir=os.path.join(tmpdir, "rundir"))
+
+    task = builder.mkTaskNode("p1.glob_uses")
+    output = asyncio.run(runner.run(task))
+
+    print("output: %s" % str(output))
+
+    assert len(output.output) == 2
+    fs = output.output[0]
+    assert len(fs.files) == 1
+    assert fs.files[0] == "top.sv"
+    fs = output.output[1]
+    assert len(fs.files) == 1
+    assert fs.files[0] == "top.v"