dv-flow-mgr 1.9.15313261228rc0__py3-none-any.whl → 1.9.15335166826rc0__py3-none-any.whl

dv_flow/mgr/__init__.py

@@ -32,6 +32,6 @@ from .task_runner import TaskSetRunner
 from .task_listener_log import TaskListenerLog
 
 VERSION="1.9.0"
-SUFFIX="15313261228rc0"
+SUFFIX="15335166826rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/cmds/cmd_graph.py

@@ -54,11 +54,11 @@ class CmdGraph(object):
         if args.task is None:
             # Print out available tasks
             tasks = []
-            for task in pkg.tasks:
+            for task in pkg.task_m.values():
                 tasks.append(task)
-            for frag in pkg._fragment_l:
-                for task in frag.tasks:
-                    tasks.append(task)
+#            for frag in pkg._fragment_l:
+#                for task in frag.tasks:
+#                    tasks.append(task)
             tasks.sort(key=lambda x: x.name)
 
             max_name_len = 0
@@ -77,7 +77,16 @@ class CmdGraph(object):
 
             builder = TaskGraphBuilder(root_pkg=pkg, rundir=rundir)
 
-            t = builder.mkTaskNode(pkg.name + "." + args.task)
+            for pref in ("", "%s." % pkg.name):
+                name = "%s%s" % (pref, args.task)
+                task = builder.findTask(name)
+                if task is not None:
+                    break
+
+            if task is None:
+                raise Exception("Task '%s' not found in package '%s'" % (args.task, pkg.name))
+
+            t = builder.mkTaskNode(task.name)
 
             TaskGraphDotWriter().write(
                 t,

dv_flow/mgr/name_resolution.py

@@ -69,5 +69,4 @@ class NameResolutionContext:
 #            pkg = self.builder._pkg_m[name]
 #            ret = pkg.paramT
 
-        print("<-- resolve: %s" % type(ret))
         return ret

dv_flow/mgr/task_graph_builder.py

@@ -199,12 +199,12 @@ class TaskGraphBuilder(object):
     def leave_uses(self):
         self._uses_count -= 1
 
-    def enter_compound(self, task : TaskNode, rundir=None):
-        self._compound_task_ctxt_s.append(CompoundTaskCtxt(
-            parent=self, task=task, rundir=rundir))
-
-        if rundir is None or rundir == RundirE.Unique:
-            self._rundir_s.append(task.name)
+#    def enter_compound(self, task : TaskNode, rundir=None):
+#        self._compound_task_ctxt_s.append(CompoundTaskCtxt(
+#            parent=self, task=task, rundir=rundir))
+#
+#        if rundir is None or rundir == RundirE.Unique:
+#            self._rundir_s.append(task.name)
 
     def enter_compound_uses(self):
         self._compound_task_ctxt_s[-1].uses_s.append({})
@@ -253,10 +253,6 @@ class TaskGraphBuilder(object):
             if name in self.root_pkg.task_m.keys():
                 task = self.mkTaskGraph(name)
                 self._log.debug("Found task %s in root package" % name)
-            else:
-                raise Exception("Failed to find task %s" % name)
-                pass
-            # Go search type definitions
             pass
 
             # Check the current package
@@ -265,13 +261,13 @@ class TaskGraphBuilder(object):
         
         return task
 
-    def leave_compound(self, task : TaskNode):
-        ctxt = self._compound_task_ctxt_s.pop()
-        if ctxt.rundir is None or ctxt.rundir == RundirE.Unique:
-            self._rundir_s.pop()
+#    def leave_compound(self, task : TaskNode):
+#        ctxt = self._compound_task_ctxt_s.pop()
+#        if ctxt.rundir is None or ctxt.rundir == RundirE.Unique:
+#            self._rundir_s.pop()
 
-    def mkTaskGraph(self, task : str, rundir=None) -> TaskNode:
-        return self.mkTaskNode(task, rundir=rundir)
+    def mkTaskGraph(self, task : str) -> TaskNode:
+        return self.mkTaskNode(task)
         
     def push_name_resolution_context(self, pkg: Package):
         """Create and push a new name resolution context"""

{dv_flow_mgr-1.9.15313261228rc0.dist-info → dv_flow_mgr-1.9.15335166826rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.9.15313261228rc0
+Version: 1.9.15335166826rc0
 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.9.15313261228rc0.dist-info → dv_flow_mgr-1.9.15335166826rc0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=kBhTSMjBOpaWyTnjbxlfzKzw4IY9BuRjj6rLrzvmhJI,1315
+dv_flow/mgr/__init__.py,sha256=MFVoepf11c5LfK49JpANKCT-R3ML0z_L8uROCbD---I,1315
 dv_flow/mgr/__main__.py,sha256=KrQGbSmZB4iHIh3skCL6pO4TxwoOs5svF2Atu9me9DA,4113
 dv_flow/mgr/cond_def.py,sha256=2ZkzPusqVkN1fFMTvkDl9O_OJLPdD_cK3xzX9J75RMw,343
 dv_flow/mgr/config.py,sha256=b2MVlVVNB0psk8x4bQRAYshkpNJrtyMtV1Ymhmx9AfM,137
@@ -14,7 +14,7 @@ dv_flow/mgr/extend_def.py,sha256=Ndh4z4XqqimtoS8-6ZNMDOvkVpVmEaWZsNEPM26PDZ0,653
 dv_flow/mgr/fileset.py,sha256=kSjz-RiuQdKGMVjmbGK5YlwY-vJKSHmgggu-1_H0DHU,1320
 dv_flow/mgr/fragment_def.py,sha256=2qx6KWiHCDvnb9JXnqIOb4n6kemAClAYuBoM6ex6xJE,1696
 dv_flow/mgr/listener_list.py,sha256=BfqvEO2AyJvyc4ClU-hPgDPqWSlqvSdG-yaFEHvUrMc,272
-dv_flow/mgr/name_resolution.py,sha256=yeOQuPRWaZRWbEc-82W7qO854RY1qicqC4IYxk8jpvQ,2727
+dv_flow/mgr/name_resolution.py,sha256=Q616rpPBtbSFYnYftImhzJSVn5yO5ggSlBb0N8GliP4,2682
 dv_flow/mgr/need_def.py,sha256=X52FJnhukwFsGCkIM-W6apZEdxqS5Gmm-rRO-TS83aU,173
 dv_flow/mgr/null_callable.py,sha256=x6hlJ9EL6xFLSGFgd14eXbxSWxsUGF56jpbLhERjPtg,243
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
@@ -36,7 +36,7 @@ dv_flow/mgr/task.py,sha256=XQ-mVyDGvpU4gB6GmnNeTQhxKqFXiblShh7qd_-SIbM,2387
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
 dv_flow/mgr/task_def.py,sha256=lhiOL7E_TfW7Ytg5qipE6d2cqTkfVqAOs1MZgtCqeLg,5257
 dv_flow/mgr/task_gen_ctxt.py,sha256=1QQqqgaCjJSlzTV0SASpTb69vINFrDq3aqjYCKUkx3s,846
-dv_flow/mgr/task_graph_builder.py,sha256=1uca7YjYAVv1dS5sWk-ztqgdIwJyp9iHkwuzBlwtQPc,33590
+dv_flow/mgr/task_graph_builder.py,sha256=7FgVi6UyuCbhJnLFJ2IkmmPqphh7SxhlcbVV5btmLFc,33427
 dv_flow/mgr/task_graph_dot_writer.py,sha256=qK4Imy9o2_F1aKoU1tJ-qoBHslq2BhSMbdjAUPfpN7I,6009
 dv_flow/mgr/task_listener_log.py,sha256=XcmBT-946DyrEYwNwbg7ejnB6Q3koybE7AekSWGxNGQ,4774
 dv_flow/mgr/task_listener_trace.py,sha256=7B-V2YK8uXd_QSGBq_7USmbe5CleVvwumU0CpsmxZvg,6224
@@ -58,7 +58,7 @@ dv_flow/mgr/task_runner.py,sha256=hfA4eGOmw-Rzur5qgcUKEwQB97Ka5AYv9QPrVZJWHUs,10
 dv_flow/mgr/type.py,sha256=hoJTatlPC0yOazKSWduK-5CfY38RPkc6qXFzOCcVSdM,723
 dv_flow/mgr/type_def.py,sha256=4sge3PibO1jDnS0cXdX0PiurcKbDA3kT6rb4DGIKwEM,1176
 dv_flow/mgr/yaml_srcinfo_loader.py,sha256=29BNRiB8Hj1FepkrLtdjHSv5U_85Q432gBeeK80nKEA,1606
-dv_flow/mgr/cmds/cmd_graph.py,sha256=yg5KbNrGvm3dySiI0Qei_pMWZkOE9GtEyaQ4IdNVmoE,2852
+dv_flow/mgr/cmds/cmd_graph.py,sha256=s6EU27myTgXm1MJ2xFb04ndOPEejTXM2Hi7ipT4o110,3181
 dv_flow/mgr/cmds/cmd_run.py,sha256=-0jfBihKTNLsHbILvul-quicUYFJ0yMcr5iZK4HFWrI,4096
 dv_flow/mgr/cmds/cmd_show.py,sha256=JOIFaVXt8YCf9bKXfq6qzV5wQdxdLHqE-yCj0ecGREs,3755
 dv_flow/mgr/cmds/cmd_util.py,sha256=jdT48T_pZozCZUzkNy7tIhYL_kMGjWbV6g92oMYhRww,985
@@ -76,9 +76,9 @@ dv_flow/mgr/util/__main__.py,sha256=ioXQ-IMZctzYysJM4RswuPWNSRxtPxzEcG5hutp3Cd4,
 dv_flow/mgr/util/util.py,sha256=BO7iqP_c9ttmXkojq7nKDN-g8wl1_Pco9k-KnrXxjwE,1889
 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.9.15313261228rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.9.15313261228rc0.dist-info/METADATA,sha256=5BROY7vNXrYT9dDsPXinlnuzr4YR-_okASGls_m8q34,13335
-dv_flow_mgr-1.9.15313261228rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dv_flow_mgr-1.9.15313261228rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.9.15313261228rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.9.15313261228rc0.dist-info/RECORD,,
+dv_flow_mgr-1.9.15335166826rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.9.15335166826rc0.dist-info/METADATA,sha256=Kf-GkVeei6wUImTLTZLbIo_k8BhNE-X7Wy3jVKwFT1s,13335
+dv_flow_mgr-1.9.15335166826rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dv_flow_mgr-1.9.15335166826rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.9.15335166826rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.9.15335166826rc0.dist-info/RECORD,,