dv-flow-mgr 0.0.1.12932354274a1__py3-none-any.whl → 0.0.1.12941329363a1__py3-none-any.whl

dv_flow/mgr/cmds/cmd_run.py

@@ -59,6 +59,8 @@ class CmdRun(object):
         tasks = []
 
         for spec in args.tasks:
+            if spec.find('.') == -1:
+                spec = pkg.name + "." + spec
             task = builder.mkTaskGraph(spec)
             tasks.append(task)
 

dv_flow/mgr/pkg_rgy.py

@@ -31,13 +31,11 @@ class PkgRgy(object):
         self._pkgpath = []
         self._pkg_m : Dict[str, Tuple[str,PackageDef]] = {}
 
-    def hasPackage(self, name, search_path=False):
+    def hasPackage(self, name, search_path=True):
         if name in self._pkg_m.keys():
             return True
-        elif search_path:
-            for p in self._pkgpath:
-                if os.path.exists(os.path.join(p, name)):
-                    return True
+        elif search_path and self._findOnPath(name) is not None:
+            return True
         else:
             return False
     
@@ -50,11 +48,33 @@ class PkgRgy(object):
                     self._pkg_m[name][0],
                     pkg_def
                 )
-                pass
             return self._pkg_m[name][1]
         else:
-            # Go search the package path
-            return None
+            return self._findOnPath(name)
+        
+    def _findOnPath(self, name):
+        name_s = name.split('.')
+        name_dir = "/".join(name_s)
+        if len(name_s) > 1:
+            name_pref = "/".join(name_s[:-1])
+        else:
+            name_pref = None
+
+        pkg = None
+
+        for path in self._pkgpath:
+            if os.path.isfile(os.path.join(path, name_dir, "flow.dv")):
+                pkg = PackageDef.load(os.path.join(path, name_dir, "flow.dv"))
+            elif name_pref is not None and os.path.isfile(os.path.join(path, name_pref, name_s[-1] + ".dv")):
+                pkg = PackageDef.load(os.path.join(path, name_pref, name_s[-1] + ".dv"))
+            elif os.path.isfile(os.path.join(path, name + ".dv")):
+                pkg = PackageDef.load(os.path.join(path, name + ".dv"))
+
+            if pkg is not None:
+                self._pkg_m[name] = (pkg.name, pkg)
+                break
+
+        return pkg
 
     def registerPackage(self, pkg_def):
         if pkg_def.name in self._pkg_m.keys():
@@ -65,6 +85,10 @@ class PkgRgy(object):
         # Register built-in package
         self._pkg_m["std"] = (os.path.join(os.path.dirname(__file__), "std/flow.dv"), None)
 
+        if "DV_FLOW_PATH" in os.environ.keys() and os.environ["DV_FLOW_PATH"] != "":
+            paths = os.environ["DV_FLOW_PATH"].split(':')
+            self._pkgpath.extend(paths)
+
         if sys.version_info < (3,10):
             from importlib_metadata import entry_points
         else:

dv_flow/mgr/task_graph_builder.py

@@ -35,7 +35,6 @@ class TaskGraphBuilder(object):
     pkg_rgy : PkgRgy = None
     _pkg_s : List[Package] = dc.field(default_factory=list)
     _pkg_m : Dict[PackageSpec,Package] = dc.field(default_factory=dict)
-    _pkg_def_m : Dict[str,PackageDef] = dc.field(default_factory=dict)
     _pkg_spec_s : List[PackageDef] = dc.field(default_factory=list)
     _task_m : Dict[TaskSpec,Task] = dc.field(default_factory=dict)
 
@@ -127,8 +126,6 @@ class TaskGraphBuilder(object):
         else:
             pkg_def = None
 
-        print("spec: %s ; _pkg_def_m: %s" % (str(spec), str(self._pkg_def_m.keys())))
-
         # Need a stack to track which package we are currently in
         # Need a map to get a concrete package from a name with parameterization
 
@@ -140,8 +137,9 @@ class TaskGraphBuilder(object):
             pkg = self._pkg_s[-1]
         if spec in self._pkg_m.keys():
             pkg = self._pkg_m[spec]
-        elif spec in self._pkg_def_m.keys():
-            pkg = self._pkg_def_m[spec].mkPackage(self)
+        elif self.pkg_rgy.hasPackage(spec.name):
+            pkg_def = self.pkg_rgy.getPackage(spec.name)
+            pkg = pkg_def.mkPackage(self)
             self._pkg_m[spec] = pkg
         else:
             pkg = None
@@ -156,22 +154,26 @@ class TaskGraphBuilder(object):
                         tgt_pkg_spec = PackageSpec(imp.name)
                         if tgt_pkg_spec in self._pkg_m.keys():
                             pkg = self._pkg_m[tgt_pkg_spec]
-                        elif tgt_pkg_spec in self._pkg_def_m.keys():
-                            base = self._pkg_def_m[tgt_pkg_spec]
+                        elif self.pkg_rgy.hasPackage(tgt_pkg_spec.name):
+                            base = self.pkg_rgy.getPackage(tgt_pkg_spec.name)
                             pkg = base.mkPackage(self, spec.params)
                             self._pkg_m[spec] = pkg
                         elif imp.path is not None:
                             # See if we can load the package
                             print("TODO: load referenced package")
                         else:
-                            raise Exception("Import alias %s not found" % imp.name)
+                            raise Exception("Failed to resolve target (%s) of import alias %s" % (
+                                imp.name,
+                                imp.alias))
                         break
                     else:
                         # Need to compare the spec with the full import spec
                         imp_spec = PackageSpec(imp.name)
                         # TODO: set parameters
                         if imp_spec == spec:
-                            base = self._pkg_def_m[PackageSpec(spec.name)]
+                            base = self.pkg_rgy.getPackage(spec.name)
+                            if base is None:
+                                raise Exception("Failed to find imported package %s" % spec.name)
                             pkg = base.mkPackage(self, spec.params)
                             self._pkg_m[spec] = pkg
                             break

dv_flow/mgr/task_graph_runner_local.py

@@ -74,6 +74,8 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
         print("dep_m: %s" % str(dep_m))
 
         order = list(toposort(dep_m))
+        
+        print("order: %s" % str(order))
 
         active_task_l : List[Tuple[Task,Coroutine]]= []
         # Now, iterate over the concurrent sets
@@ -93,9 +95,9 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
                                 active_task_l.pop(i)
                                 break
                 if t not in self.done_task_m.keys():
-                    task = task_m[t]
-                    coro = asyncio.Task(task.do_run())
-                    active_task_l.append((task, coro))
+                    task_t = task_m[t]
+                    coro = asyncio.Task(task_t.do_run())
+                    active_task_l.append((task_t, coro))
                
             # Now, wait for tasks to complete
             if len(active_task_l):
@@ -110,7 +112,7 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
         ret = None
 
         if unwrap:
-            return task.output
+            return task[0].output
         else:
             return list(t.output for t in task)
         

{dv_flow_mgr-0.0.1.12932354274a1.dist-info → dv_flow_mgr-0.0.1.12941329363a1.dist-info}/METADATA

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

@@ -5,25 +5,25 @@ dv_flow/mgr/fragment_def.py,sha256=p5i6ONtBWlDHTBFsduu3Z36_76Bn8PCIylp_xoZ7jfQ,1
 dv_flow/mgr/package.py,sha256=7G_ZQaTHin_mcwQu1PRsGmqfKAbdu9IC5HeLXtPgBDc,1342
 dv_flow/mgr/package_def.py,sha256=3X0lrbU_SCNhxF9wFTpfQcmD1AbOv4XhnA-5U0IPouk,11431
 dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
-dv_flow/mgr/pkg_rgy.py,sha256=ANnG7eyWN-PBgyYlKzq4ThoQNT2YoYm_5xXIK5HzypA,3408
+dv_flow/mgr/pkg_rgy.py,sha256=ej8VyWH8BWdDNVqk3cSJgQq4h3bW1rgj6uCxUr7gfH8,4384
 dv_flow/mgr/task.py,sha256=ewJ7bCFWqwVuzHZZsX2LDZfzXWVFfFlH8yFyn-xxIVg,5043
 dv_flow/mgr/task_data.py,sha256=-6Dqa3oUI7RJc1Js2SRSnhxNTcASkamXFYMN6UiknZQ,10376
 dv_flow/mgr/task_def.py,sha256=96hSwqJo0MazJ1VcLhovYRmNCplsNLt47AumtyjSddU,1690
-dv_flow/mgr/task_graph_builder.py,sha256=74w2A2XabL6xZVzb8bcKtSSdXdw7mzHJ69O7LrhkjMU,7935
+dv_flow/mgr/task_graph_builder.py,sha256=hK4CxIBlyCL9L9iNQdDNQGrChfoFKmYtU7PT51g_PHM,8080
 dv_flow/mgr/task_graph_runner.py,sha256=NwNYcOJ952lPMLwIIlYE9CoDdedqvcw2fWHYUsKFXuU,2164
-dv_flow/mgr/task_graph_runner_local.py,sha256=QDCUyFj_m4hJTUsZD5nCUCnPu3hysdk65-gVA8eJ894,4546
+dv_flow/mgr/task_graph_runner_local.py,sha256=-O0_TPuXoMrRvpSUWJZffDkUDyBC5PCnLCXJ4T30FgA,4604
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
 dv_flow/mgr/util.py,sha256=06eVyURF4ga-s8C9Sd3ZSDebwO4QS0XXaB8xADVbWRc,1437
-dv_flow/mgr/cmds/cmd_run.py,sha256=PqAbPMwqovaaq14tnNrCvP7-De8lMI09X0R7d6RIbwY,2691
+dv_flow/mgr/cmds/cmd_run.py,sha256=C1bd2yZxVU03hZizGLYoH1JfZgeq_G57Kajc279iZpo,2773
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/fileset.py,sha256=qY4RMqTHZaFZk68Y3oXtDv2_Ezu1r4wYvaRvr0GTyIY,2352
 dv_flow/mgr/std/flow.dv,sha256=pSpzrPPEu_L8DHccGfArxsKYgUfyQidShZc0ShgGtsY,500
 dv_flow/mgr/std/message.py,sha256=BPTHnEMD4tBufQ9LvsS9Sa_0xjaJATbBpwqosWslvVA,193
 dv_flow/mgr/std/task_fileset.py,sha256=UzTYONvK0X9rgy3rP9LiX4giBU8SyCCJav0LSNUJ1Qg,3140
 dv_flow/mgr/std/task_null.py,sha256=UEJ3fIoIMYWVsagiQC7GHD23UES7WoH4wtq94b4tcs4,265
-dv_flow_mgr-0.0.1.12932354274a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.12932354274a1.dist-info/METADATA,sha256=xH_NHN7r8gQWETTOMtWk_qz8bx--4rQMhQgAMPpgcmU,13276
-dv_flow_mgr-0.0.1.12932354274a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dv_flow_mgr-0.0.1.12932354274a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.12932354274a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.12932354274a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.12941329363a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.12941329363a1.dist-info/METADATA,sha256=xuwb28g214WYwODgXHPicVVFvDj2Ct4TczlbOeDIuG8,13276
+dv_flow_mgr-0.0.1.12941329363a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dv_flow_mgr-0.0.1.12941329363a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.12941329363a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.12941329363a1.dist-info/RECORD,,