dv-flow-mgr 0.0.1.13711946395a1__py3-none-any.whl → 0.0.1.13712162545a1__py3-none-any.whl

dv_flow/mgr/task_graph_builder.py

@@ -51,10 +51,8 @@ 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)
+            visited = set()
+            self._registerPackages(self.root_pkg, visited)
 
             self._pkg_spec_s.append(self.root_pkg)
             pkg = self.root_pkg.mkPackage(self)
@@ -63,6 +61,15 @@ class TaskGraphBuilder(object):
             # Allows us to find ourselves
             self._pkg_m[PackageSpec(self.root_pkg.name)] = pkg
 
+    def _registerPackages(self, pkg : PackageDef, visited):
+        self._logger.debug("Packages: %s" % str(pkg))
+        if pkg.name not in visited:
+            visited.add(pkg.name)
+            self._logger.debug("Registering package %s" % pkg.name)
+            self.pkg_rgy.registerPackage(pkg)
+            for subpkg in pkg.subpkg_m.values():
+                self._registerPackages(subpkg, visited)
+
 
     def push_package(self, pkg : Package, add=False):
         self._pkg_s.append(pkg)
@@ -113,10 +120,11 @@ class TaskGraphBuilder(object):
         for need_def in ctor_t.getNeeds():
             # Resolve the full name of the need
             need_fullname = self._resolveNeedRef(need_def)
-            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])
+            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()

{dv_flow_mgr-0.0.1.13711946395a1.dist-info → dv_flow_mgr-0.0.1.13712162545a1.dist-info}/METADATA

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

@@ -19,7 +19,7 @@ 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=aiHCtNSDnzDxTylIKn482Ee58T074SVjpxWnr7xk45U,8755
+dv_flow/mgr/task_graph_builder.py,sha256=AOltPyzd2Q9B67m0MyL59RPu3i2d5QrX3K-0gKWLoY8,9097
 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.13711946395a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13711946395a1.dist-info/METADATA,sha256=M6JigWeeKUC2TjPf0_rCn9U9nf16TYwFpTmBQfQ7LXg,13314
-dv_flow_mgr-0.0.1.13711946395a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-dv_flow_mgr-0.0.1.13711946395a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13711946395a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13711946395a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13712162545a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13712162545a1.dist-info/METADATA,sha256=ijvULF5NqHsgXsySWGurlwrguxvxJe5ubZna365nD0M,13314
+dv_flow_mgr-0.0.1.13712162545a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+dv_flow_mgr-0.0.1.13712162545a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13712162545a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13712162545a1.dist-info/RECORD,,