dv-flow-mgr 0.0.1.13711518075a1__py3-none-any.whl → 0.0.1.13711986746a1__py3-none-any.whl

dv_flow/mgr/pkg_rgy.py

@@ -122,6 +122,12 @@ class PkgRgy(object):
         # for pkg in self._load_pkg_list():
         #     self._pkgs[pkg.name] = pkg
 
+    def copy(self):
+        ret = PkgRgy()
+        ret._pkgpath = self._pkgpath.copy()
+        ret._pkg_m = self._pkg_m.copy()
+        return ret
+
     @classmethod
     def inst(cls):
         if cls._inst is None:

dv_flow/mgr/task_graph_builder.py

@@ -43,7 +43,7 @@ class TaskGraphBuilder(object):
 
     def __post_init__(self):
         if self.pkg_rgy is None:
-            self.pkg_rgy = PkgRgy.inst()
+            self.pkg_rgy = PkgRgy.inst().copy()
 
         self._logger = logging.getLogger(type(self).__name__)
         self._logger.debug("TaskGraphBuilder: root_pkg: %s" % str(self.root_pkg))
@@ -51,6 +51,7 @@ class TaskGraphBuilder(object):
         if self.root_pkg is not None:
 
             # Register package definitions found during loading
+            self._logger.debug("Packages: %s" % str(self.root_pkg))
             for subpkg in self.root_pkg.subpkg_m.values():
                 self._logger.debug("Registering package %s" % subpkg.name)
                 self.pkg_rgy.registerPackage(subpkg)
@@ -110,10 +111,13 @@ class TaskGraphBuilder(object):
         needs = []
 
         for need_def in ctor_t.getNeeds():
-            if not need_def in self._task_m.keys():
-                need_t = self._mkTaskGraph(need_def, rundir)
-                self._task_m[need_def] = need_t
-            needs.append(self._task_m[need_def])
+            # Resolve the full name of the need
+            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():
+                need_t = self._mkTaskGraph(need_fullname, rundir)
+                self._task_m[need_fullname] = need_t
+            needs.append(self._task_m[need_fullname])
 
         # The returned task should have all param references resolved
         params = ctor_t.mkTaskParams()
@@ -134,6 +138,13 @@ class TaskGraphBuilder(object):
 
         return task
 
+    def _resolveNeedRef(self, need_def) -> str:
+        if need_def.find(".") == -1:
+            # Need is a local task. Prefix to avoid ambiguity
+            return self._pkg_s[-1].name + "." + need_def
+        else:
+            return need_def
+
     def getPackage(self, spec : PackageSpec) -> Package:
         # Obtain the active package definition
         self._logger.debug("--> getPackage: %s len: %d" % (spec.name, len(self._pkg_spec_s)))

{dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711986746a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13711518075a1
+Version: 0.0.1.13711986746a1
 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.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711986746a1.dist-info}/RECORD

@@ -13,13 +13,13 @@ dv_flow/mgr/param.py,sha256=3BY-ucig6JRw73FhjyJQL-vpd57qhAzixgZ8I5FoUpw,553
 dv_flow/mgr/param_def.py,sha256=gLua-EQiY8V2CFX-2svLRIlrs8PEeGh4-EPtn4a2Mng,712
 dv_flow/mgr/param_ref_eval.py,sha256=U8QhDf1n_9bLnExdc1oQamq5-pOUXrFalOX4oyR9UoM,1138
 dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
-dv_flow/mgr/pkg_rgy.py,sha256=VSk5Uq4XP2DVITsxzfJY75s54Th4PKMrBPd535BHGAs,4743
+dv_flow/mgr/pkg_rgy.py,sha256=sCMNBTEWAAz1a0AnyeFm097RiVdjmo1yFRqdgC3TA-U,4890
 dv_flow/mgr/task.py,sha256=kLQSvnVwj9ROIDtxq8lLu-4mJizTxOqvUeogmgN6QAA,5976
 dv_flow/mgr/task_ctor.py,sha256=hlfl-UVvyjzLFN6D0Oel9eBs0xUQPqCX7gQ0uEHoL7o,1382
 dv_flow/mgr/task_data.py,sha256=F0X-e0IHTh06Z0F67TWIUPKuJYf6JPzZyMPrDzOJvK0,11409
 dv_flow/mgr/task_def.py,sha256=Wmh78mQLAiHXlpD2KCvFxTWtnjjwgct8fEm8gelCg1c,1987
 dv_flow/mgr/task_exec_data.py,sha256=aT__kmVmNxqnS_GbTRS1vrYgKiv8cH-HUSmRb6YYKsI,640
-dv_flow/mgr/task_graph_builder.py,sha256=CHOUpjGacGCQPPDwFNRl9nsL8tRa7nOkog3W9CEqD0s,8326
+dv_flow/mgr/task_graph_builder.py,sha256=_eEDw6MvXSl4w9mMrRU9J2ZC0B5TOlmgI5kEE5KFWy8,8861
 dv_flow/mgr/task_graph_runner.py,sha256=jUGI49QvxUCfQoKQDDk2psbeapIcCg72qNOW1JipHzM,2182
 dv_flow/mgr/task_graph_runner_local.py,sha256=OrydPwtQ8E7hYWvSXx0h7lI3nfUNFyklULhsyMwz9dA,4687
 dv_flow/mgr/task_impl_data.py,sha256=bFPijoKrh9x7fZN2DsvRJp0UHo-gGM0VjtDQISyfhFk,321
@@ -39,9 +39,9 @@ dv_flow/mgr/std/fileset.py,sha256=69cgah6jmRNGmFaLZKpMUaxVSaQ5DxtrqshhQwXhO54,29
 dv_flow/mgr/std/flow.dv,sha256=DpDTrRBfbIt4cJKLHqk_l6_nPkeFDKLVa5Ic4FZodNM,1587
 dv_flow/mgr/std/message.py,sha256=T8Ye44784rD6CT2qIAP5SD7sKPdAlGMFimc4IaPCxxE,200
 dv_flow/mgr/std/task_null.py,sha256=UKwUnqwFPBY8BO44ZAPcgehQB59kHZFa1qyZc1TwUqE,196
-dv_flow_mgr-0.0.1.13711518075a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13711518075a1.dist-info/METADATA,sha256=oZEJKlt5tXWMzV05vw3iOJcXIl8j4P-DhmlBfJ_fpjE,13314
-dv_flow_mgr-0.0.1.13711518075a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-dv_flow_mgr-0.0.1.13711518075a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13711518075a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13711518075a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13711986746a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13711986746a1.dist-info/METADATA,sha256=2pUY0A43RCyr_8WHIN15DnBOcKFbmhRgeO2pbfan0qU,13314
+dv_flow_mgr-0.0.1.13711986746a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+dv_flow_mgr-0.0.1.13711986746a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13711986746a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13711986746a1.dist-info/RECORD,,