dv-flow-mgr 1.0.0.14457729129a1__tar.gz → 1.0.0.14473683177a1__tar.gz

{dv_flow_mgr-1.0.0.14457729129a1 → dv_flow_mgr-1.0.0.14473683177a1}/PKG-INFO

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

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

{dv_flow_mgr-1.0.0.14457729129a1 → dv_flow_mgr-1.0.0.14473683177a1}/src/dv_flow/mgr/__main__.py

@@ -21,6 +21,7 @@
 #****************************************************************************
 import argparse
 import logging
+import os
 from .cmds.cmd_graph import CmdGraph
 from .cmds.cmd_run import CmdRun
 from .cmds.cmd_show import CmdShow
@@ -45,6 +46,8 @@ def get_parser():
     graph_parser.add_argument("task", nargs="?", help="task to graph")
     graph_parser.add_argument("-f", "--format", help="Specifies the output format",
                               default="dot")
+    graph_parser.add_argument("--root", 
+                              help="Specifies the root directory for the flow")
     graph_parser.add_argument("-o", "--output", 
                               help="Specifies the output file",
                               default="-")
@@ -55,9 +58,11 @@ def get_parser():
     run_parser.add_argument("-j",
                         help="Specifies degree of parallelism. Uses all cores by default",
                         type=int, default=-1)
-    run_parser.add_argument("-c", "--clean",
+    run_parser.add_argument("--clean",
                             action="store_true",
                             help="Cleans the rundir before running")
+    run_parser.add_argument("--root", 
+                              help="Specifies the root directory for the flow")
     run_parser.set_defaults(func=CmdRun())
 
     show_parser = subparsers.add_parser('show', 

{dv_flow_mgr-1.0.0.14457729129a1 → dv_flow_mgr-1.0.0.14473683177a1}/src/dv_flow/mgr/cmds/cmd_graph.py

@@ -35,8 +35,16 @@ class CmdGraph(object):
 
     def __call__(self, args):
 
+        if args.root is not None:
+            rootdir = args.root
+        elif "DV_FLOW_ROOT" in os.environ.keys():
+            rootdir = os.environ["DFM_ROOT"]
+        else:
+            rootdir = os.getcwd()
+
+
         # First, find the project we're working with
-        pkg = loadProjPkgDef(os.getcwd())
+        pkg = loadProjPkgDef(rootdir)
 
         if pkg is None:
             raise Exception("Failed to find a 'flow.dv' file that defines a package in %s or its parent directories" % os.getcwd())

{dv_flow_mgr-1.0.0.14457729129a1 → dv_flow_mgr-1.0.0.14473683177a1}/src/dv_flow/mgr/cmds/cmd_run.py

@@ -33,10 +33,16 @@ class CmdRun(object):
     _log : ClassVar = logging.getLogger("CmdRun")
 
     def __call__(self, args):
+        if args.root is not None:
+            rootdir = args.root
+        elif "DV_FLOW_ROOT" in os.environ.keys():
+            rootdir = os.environ["DFM_ROOT"]
+        else:
+            rootdir = os.getcwd()
 
         # First, find the project we're working with
         listener = TaskListenerLog()
-        pkg = loadProjPkgDef(os.getcwd(), listener=listener)
+        pkg = loadProjPkgDef(rootdir, listener=listener)
 
         if pkg is None:
             raise Exception("Failed to find a 'flow.dv' file that defines a package in %s or its parent directories" % os.getcwd())

{dv_flow_mgr-1.0.0.14457729129a1 → dv_flow_mgr-1.0.0.14473683177a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -389,9 +389,9 @@ class TaskGraphBuilder(object):
         self._log.debug("--> processing needs (%s) (%d)" % (task.name, len(task.needs)))
         for need in task.needs:
             need_n = self._getTaskNode(need.name)
-            self._log.debug("Add need %s" % need_n.name)
             if need_n is None:
                 raise Exception("Failed to find need %s" % need.name)
+            self._log.debug("Add need %s with %d dependencies" % (need_n.name, len(need_n.needs)))
             node.input.needs.append((need_n, False))
 #            node.needs.append((need_n, False))
         self._log.debug("<-- processing needs")
@@ -415,10 +415,13 @@ class TaskGraphBuilder(object):
             self._log.debug("Process node %s" % t.name)
 
             referenced = None
-            for tt in task.subtasks:
-                if tt in t.needs:
-                    referenced = tt
-                    break
+            for tt in node.tasks:
+                self._log.debug("  Checking task %s" % tt.name)
+                for tnn,_ in tt.needs:
+                    self._log.debug("    Check against need %s" % tnn.name)
+                    if tn == tnn:
+                        referenced = tnn
+                        break
 
             refs_internal = None
             # Assess how this task is connected to others in the compound node
@@ -440,7 +443,7 @@ class TaskGraphBuilder(object):
                 self._log.debug("Node %s references internal node %s" % (t.name, refs_internal.name))
 
             if referenced is not None:
-                self._log.debug("Node %s has internal needs" % tn.name)
+                self._log.debug("Node %s has internal needs: %s" % (tn.name, referenced.name))
             else:
                 # Add this task as a dependency of the output
                 # node (the root one)

{dv_flow_mgr-1.0.0.14457729129a1 → dv_flow_mgr-1.0.0.14473683177a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.0.0.14457729129a1
+Version: 1.0.0.14473683177a1
 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.14457729129a1 → dv_flow_mgr-1.0.0.14473683177a1}/tests/unit/test_compound_task.py

@@ -376,3 +376,60 @@ package:
     assert os.path.isfile(os.path.join(rundir, "rundir/foo.entry/foo.entry.mytask/mytask.txt"))
     content = open(os.path.join(rundir, "rundir/foo.entry/foo.entry.mytask/mytask.txt"), "r").read().strip()
     assert content == "inputs: 1"
+
+def test_compound_input_auto_bind_chain(tmpdir):
+    flow_dv = """
+package:
+    name: foo
+
+    tasks:
+    - name: TopLevelTask
+      uses: std.CreateFile
+      with:
+        filename: TopLevelTask.txt
+        content: "TopLevelTask.txt"
+
+    - name: entry
+      needs: [TopLevelTask]
+      body:
+      - name: mytask1
+        passthrough: all
+      - name: mytask2
+        passthrough: all
+        needs: [mytask1]
+      - name: mytask3
+        passthrough: all
+        needs: [mytask2]
+      - name: mytask4
+        passthrough: all
+        needs: [mytask3]
+"""
+
+    rundir = os.path.join(tmpdir)
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+
+    marker_collector = MarkerCollector()
+    pkg_def = PackageLoader(
+        marker_listeners=[marker_collector]).load(
+            os.path.join(rundir, "flow.dv"))
+    assert len(marker_collector.markers) == 0
+
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=os.path.join(rundir, "rundir"))
+    runner = TaskSetRunner(rundir=os.path.join(rundir, "rundir"))
+
+    t1 = builder.mkTaskNode("foo.entry")
+
+    TaskGraphDotWriter().write(
+        t1, 
+        os.path.join(rundir, "graph.dot"))
+
+    output = asyncio.run(runner.run(t1))
+
+    assert runner.status == 0
+    assert len(output.output) == 1
+    assert output.output[0].src == 'foo.TopLevelTask'
+    assert output.output[0].type == 'std.FileSet'
+    assert len(output.output[0].files) == 1

{dv_flow_mgr-1.0.0.14457729129a1 → dv_flow_mgr-1.0.0.14473683177a1}/tests/unit/test_graph.py

@@ -195,6 +195,6 @@ package:
     assert runner.status == 0
     for out in output.output:
         print("Out: %s" % str(out))
-    assert len(output.output) == 1
+    assert len(output.output) == 2
     assert output.output[0].type == 'std.FileSet'
     assert len(output.output[0].files) == 1