dv-flow-mgr 1.0.0.14457729129a1__py3-none-any.whl → 1.0.0.14473683177a1__py3-none-any.whl

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/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/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/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.dist-info → dv_flow_mgr-1.0.0.14473683177a1.dist-info}/METADATA

@@ -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.dist-info → dv_flow_mgr-1.0.0.14473683177a1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dv_flow/mgr/__init__.py,sha256=dsBbrdDvG4Y2ZlQIxU-0SuJMultZbIGLnvmpD0B0ICo,1235
-dv_flow/mgr/__main__.py,sha256=4_MJIH-FxIFXrk5pvic9bBereeZxQsrxnESA4SZ5q9U,3600
+dv_flow/mgr/__main__.py,sha256=BogNdBkXhgg05E8_IumNkVoag6WwvfbpiI8346oOtPo,3844
 dv_flow/mgr/cond_def.py,sha256=2ZkzPusqVkN1fFMTvkDl9O_OJLPdD_cK3xzX9J75RMw,343
 dv_flow/mgr/config.py,sha256=nF_hM-RwJLvgfbwRe11a1wsAu_SihSd5qOxQi7I6lvU,108
 dv_flow/mgr/config_def.py,sha256=_71YbjaHbSx7REWxG3uDw8lh8-k7UzEvSXlEFy2V1Rc,1121
@@ -31,7 +31,7 @@ dv_flow/mgr/srcinfo.py,sha256=xrfp-relVr7hYNbxOjY5jqX4H0nNMm9HK5AAM6_Piyk,366
 dv_flow/mgr/task.py,sha256=Xe1sCCTN4yJwhB2Aw_rywdlmVPY2CDnuwZisULuOXhw,2036
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
 dv_flow/mgr/task_def.py,sha256=VAjkFay7KxXfZoloZfbiPr6WhURztV2Dxm6-REMQweo,4912
-dv_flow/mgr/task_graph_builder.py,sha256=AMvvQjRLkjPYw5JfKw3ZaF1f02E9FJHBAUtulj4mJBM,17210
+dv_flow/mgr/task_graph_builder.py,sha256=UcmDw7Wn8hYbUOFBeWHHrT2ahTzmxQsRU2xRGswfBf0,17460
 dv_flow/mgr/task_graph_dot_writer.py,sha256=fZlNR-ZUFsI5FpH1KFCWJcSpyLSKUh8IhHO9Eavc60c,4925
 dv_flow/mgr/task_listener_log.py,sha256=QH7hAVO1agYJoOx16XqjWv1c-jk5zb6p6A-hic7OMU0,4150
 dv_flow/mgr/task_node.py,sha256=hPlCcped3nCNgOYj4oysVcxu4cHOIUCBUqAevOr20Lc,5086
@@ -51,8 +51,8 @@ dv_flow/mgr/task_runner.py,sha256=6wtaEh7iflnAtBZk73LNYNo6Kv4aOYKy-7bW5e5Zkxk,97
 dv_flow/mgr/type.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/type_def.py,sha256=NDeyplKrPnWwEv4yHkhXEMK9d9j39b5MOeLB-1Mchqo,1095
 dv_flow/mgr/yaml_srcinfo_loader.py,sha256=5ibJ9lpM7HYpgkRxozlZJx8hnUqjfq1cmYQm3ZhVgv8,1589
-dv_flow/mgr/cmds/cmd_graph.py,sha256=mvOE_PCq7l9htVbUiBNv6iu6WvFJJJ2KhrCcsNsDGNM,2641
-dv_flow/mgr/cmds/cmd_run.py,sha256=AdGe1ioQJzEvVyq1oHT67uoHAyfiPoHXWf-cbvmhGYU,3288
+dv_flow/mgr/cmds/cmd_graph.py,sha256=J9tVxve0Zytq8vjizOUtBG7fvB_qW5fPg1rHq-smF0o,2848
+dv_flow/mgr/cmds/cmd_run.py,sha256=yMzDcZrjnq0YPgY4g3IqzuSFJdpGUYmPBtU7USLfP34,3493
 dv_flow/mgr/cmds/cmd_show.py,sha256=UD4HEguZZomKBO-UyOCYyftINBPG1Ka1p_XQvkHBTkw,3743
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/create_file.py,sha256=TAUhpXlTmUDUYw4Dw0cI9FPuYI84yCVkoadnWZxi_8U,2888
@@ -66,9 +66,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=cBNt3JJ0PGLlUQFTtBLi12i2j_9gNgSBtKdwS3VfF5Y,1566
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=IJzZdxCSEgIQ79LpYiM7UqJ9RJ-7yraqmBN2XVgAgXA,1752
-dv_flow_mgr-1.0.0.14457729129a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.0.0.14457729129a1.dist-info/METADATA,sha256=zEZXmvd8jfMK3AM4X8znfRsXyztd19PkyZqiU_P_LKk,13336
-dv_flow_mgr-1.0.0.14457729129a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-1.0.0.14457729129a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.0.0.14457729129a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.0.0.14457729129a1.dist-info/RECORD,,
+dv_flow_mgr-1.0.0.14473683177a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.0.0.14473683177a1.dist-info/METADATA,sha256=RmYTc5OPUU5BPl5g08YXRd0ylhqrdvTzcmA67ogPEQo,13336
+dv_flow_mgr-1.0.0.14473683177a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-1.0.0.14473683177a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.0.0.14473683177a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.0.0.14473683177a1.dist-info/RECORD,,