dv-flow-mgr 1.9.14960994514rc0__py3-none-any.whl → 1.9.14984445659rc0__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="14960994514rc0"
+SUFFIX="14984445659rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/package.py

@@ -21,13 +21,18 @@
 #****************************************************************************
 import dataclasses as dc
 import logging
-from typing import Any, ClassVar, Dict, List
+from typing import Any, ClassVar, Dict, List, Union
 from .fragment_def import FragmentDef
 from .package_def import PackageDef
 from .srcinfo import SrcInfo
 from .task import Task
 from .type import Type
 
+@dc.dataclass
+class Override(object):
+    target : Union[str, 'Package']
+    override : Union[str, 'Package']
+
 @dc.dataclass
 class Package(object):
     pkg_def : PackageDef
@@ -39,6 +44,7 @@ class Package(object):
     type_m : Dict[str,Type] = dc.field(default_factory=dict)
     fragment_def_l : List[FragmentDef] = dc.field(default_factory=list)
     pkg_m : Dict[str, 'Package'] = dc.field(default_factory=dict)
+#    overrides : Dict[str, str]
     srcinfo : SrcInfo = None
     _log : ClassVar = logging.getLogger("Package")
 

dv_flow/mgr/package_def.py

@@ -39,6 +39,9 @@ from .srcinfo import SrcInfo
 from .task_def import TaskDef
 from .type_def import TypeDef
 
+class Override(BaseModel):
+    name : str = dc.Field()
+    override : str = dc.Field(alias="with")
 
 class PackageDef(BaseModel):
     name : str = dc.Field(
@@ -50,6 +53,8 @@ class PackageDef(BaseModel):
     imports : List[Union[str,PackageImportSpec]] = dc.Field(
         default_factory=list,
         description="List of packages to import")
+    overrides : Dict[str, str] = dc.Field(default_factory=dict,
+        description="Overrides for packages and parameters")
     fragments: List[str] = dc.Field(
         default_factory=list,
         description="List of fragments to include")

dv_flow/mgr/package_loader.py

@@ -27,6 +27,7 @@ class SymbolScope(object):
     name : str
     task_m : Dict[str,Task] = dc.field(default_factory=dict)
     type_m : Dict[str,Type] = dc.field(default_factory=dict)
+    override_m : Dict[str,Any] = dc.field(default_factory=dict)
 
     def add(self, task, name):
         self.task_m[name] = task
@@ -71,11 +72,29 @@ class LoaderScope(SymbolScope):
         # Split the name into elements
         name_elems = name.split('.')
 
+        def find_pkg(pkg_name):
+            pkg = None
+
+            if pkg_name in self.loader._pkg_m.keys():
+                pkg = self.loader._pkg_m[pkg_name]
+            else:
+                path = self.loader.pkg_rgy.findPackagePath(pkg_name)
+                if path is not None:
+                    path = os.path.normpath(path)
+                    pkg = self.loader._loadPackage(path)
+                    self.loader._pkg_m[pkg_name] = pkg
+            if pkg is not None:
+                self._log.debug("Found pkg %s (%s)" % (pkg_name, str(pkg.task_m.keys())))
+            else:
+                self._log.debug("Failed to find pkg %s" % pkg_name)
+            
+            return pkg
+
         if len(name_elems) > 1:
             for i in range(len(name_elems)-1, -1, -1):
                 pkg_name = ".".join(name_elems[:i+1])
 
-                pkg = self.findPackage(pkg_name)
+                pkg = find_pkg(pkg_name)
                 if pkg is not None:
                     break;
 
@@ -107,25 +126,6 @@ class LoaderScope(SymbolScope):
         self._log.debug("<-- findType: %s (%s)" % (name, str(ret)))
 
         return ret
-    
-    def findPackage(self, name) -> Package:
-        pkg = None
-
-        if name in self.loader._pkg_m.keys():
-            pkg = self.loader._pkg_m[name]
-        else:
-            path = self.loader.pkg_rgy.findPackagePath(name)
-            if path is not None:
-                path = os.path.normpath(path)
-                pkg = self.loader._loadPackage(path)
-                self.loader._pkg_m[name] = pkg
-        if pkg is not None:
-            self._log.debug("Found pkg %s (%s)" % (name, str(pkg.task_m.keys())))
-        else:
-            self._log.debug("Failed to find pkg %s" % name)
-            
-        return pkg
-
 
 @dc.dataclass
 class PackageScope(SymbolScope):
@@ -276,6 +276,16 @@ class PackageLoader(object):
                 ret = scope
                 break
         return ret
+    
+    def push_package_scope(self, pkg):
+        if len(self._pkg_s):
+            # Pull forward the overrides 
+            pkg.override_m = self._pkg_s[-1].override_m.copy()
+        self._pkg_s.append(pkg)
+        pass
+
+    def pop_package_scope(self):
+        self._pkg_s.pop()
 
     def _loadPackage(self, root, exp_pkg_name=None) -> Package:
         if root in self._file_s:
@@ -358,6 +368,13 @@ class PackageLoader(object):
         # TODO: handle 'uses' for packages
         pkg.paramT = self._getParamT(pkg_def, None)
 
+        # Apply any overrides from above
+
+        # Now, apply these overrides to the 
+        for target,override in pkg_def.overrides.items():
+            # TODO: expand target, override
+            pass
+
         pkg_scope = self.package_scope()
         if pkg_scope is not None:
             self._log.debug("Add self (%s) as a subpkg of %s" % (pkg.name, pkg_scope.pkg.name))
@@ -375,7 +392,8 @@ class PackageLoader(object):
                 pkg_scope.pkg.pkg_m[pkg.name] = pkg
 
             self._pkg_m[pkg.name] = pkg
-            self._pkg_s.append(PackageScope(name=pkg.name, pkg=pkg, loader=self._loader_scope))
+            self.push_package_scope(PackageScope(name=pkg.name, pkg=pkg, loader=self._loader_scope))
+
             # Imports are loaded first
             self._loadPackageImports(pkg, pkg_def.imports, pkg.basedir)
 
@@ -387,7 +405,7 @@ class PackageLoader(object):
             self._loadTypes(pkg, typedefs)
             self._loadTasks(pkg, taskdefs, pkg.basedir)
 
-            self._pkg_s.pop()
+            self.pop_package_scope()
 
         self._log.debug("<-- _mkPackage %s (%s)" % (pkg_def.name, pkg.name))
         return pkg
@@ -593,13 +611,7 @@ class PackageLoader(object):
                 task.uses = self._findTaskOrType(taskdef.uses)
 
                 if task.uses is None:
-                    closest = self.find_closest_name(taskdef.uses)
-                    if closest:
-                        self.error("failed to resolve task-uses %s. Did you mean %s?" % (
-                            taskdef.uses, 
-                            closest), taskdef.srcinfo)
-                    else:
-                        self.error("failed to resolve task-uses %s" % taskdef.uses, taskdef.srcinfo)
+                    self.error("failed to resolve task-uses %s" % taskdef.uses, taskdef.srcinfo)
                     continue
             
             passthrough, consumes, rundir = self._getPTConsumesRundir(taskdef, task.uses)
@@ -936,29 +948,3 @@ class PackageLoader(object):
     def marker(self, marker):
         for l in self.marker_listeners:
             l(marker)
-
-    def find_closest_name(self, name):
-        import difflib
-
-        # First see if we can find the package
-
-        name_s = set()
-        pkg_s = set()
-        for p in self._pkg_m.values():
-            self._gatherTaskNames(name_s, pkg_s, p)
-
-        closest_matches = difflib.get_close_matches(name, name_s)
-
-        if closest_matches and len(closest_matches) > 0:
-            closest_match = closest_matches[0]
-            self._log.debug("Closest match: %s" % closest_match)
-            return closest_match
-
-    def _gatherTaskNames(self, name_s, pkg_s, pkg):
-        if pkg.name not in pkg_s:
-            pkg_s.add(pkg.name)
-            for t in pkg.task_m.keys():
-                name_s.add(t)
-            for p in pkg.pkg_m.values():
-                self._gatherTaskNames(name_s, pkg_s, p)
-

dv_flow/mgr/task_listener_log.py

@@ -100,9 +100,17 @@ class TaskListenerLog(object):
             sev_pref,
             (" " + name) if name is not None and name != "" else "",
             m.msg)
+        
+        # Escape anything that looks like a styling marker
+        msg = msg.replace("[", "\\[")
+
 
         if m.loc is not None:
-            self.console.print("%s" % msg)
+
+            try:
+                self.console.print("%s" % msg)
+            except Exception as e:
+                self._log.error("Problem displaying message \"%s\" to the console: %s" % (msg, e))
             if m.loc.line != -1 and m.loc.pos != -1:
                 self.console.print("    %s:%d:%d" % (m.loc.path, m.loc.line, m.loc.pos))
             elif m.loc.line != -1:
@@ -110,9 +118,12 @@ class TaskListenerLog(object):
             else:
                 self.console.print("    %s" % m.loc.path)
         else:
-            self.console.print("%s%s" % (
-                msg, 
-                ("(%s)" % rundir) if rundir is not None else ""))
+            try:
+                self.console.print("%s%s" % (
+                    msg, 
+                    ("(%s)" % rundir) if rundir is not None else ""))
+            except Exception as e:
+                self._log.error("Problem displaying message \"%s\" to the console: %s" % (msg, e))
 
         pass
 

{dv_flow_mgr-1.9.14960994514rc0.dist-info → dv_flow_mgr-1.9.14984445659rc0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=rrgP6VRo_ZaomShkYYncWAMoUHqMTseK1mKomWt7zDc,1315
+dv_flow/mgr/__init__.py,sha256=-6xIQMeY8cnLTIa2To7xXMSSvPpXHuUX6NiFj5XUMog,1315
 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=b2MVlVVNB0psk8x4bQRAYshkpNJrtyMtV1Ymhmx9AfM,137
@@ -18,10 +18,10 @@ dv_flow/mgr/name_resolution.py,sha256=yeOQuPRWaZRWbEc-82W7qO854RY1qicqC4IYxk8jpv
 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
-dv_flow/mgr/package.py,sha256=L1ba5xguOZWuyg9s4MfafKgSoIka3SgAQzYAmcV7XgQ,4430
-dv_flow/mgr/package_def.py,sha256=1O1SBJATnw-zeYKRNENgw-RWxZK0hxNQhnncfE_NR-U,5674
+dv_flow/mgr/package.py,sha256=qz17dfKW3csOiACUe4TqrOnd8Z2d_DxYbLmP0OwhKZ8,4580
+dv_flow/mgr/package_def.py,sha256=h3_FIKQB0vqfcu1jRAZuB8W8Kozr62oaKNchxeNjpWk,5898
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
-dv_flow/mgr/package_loader.py,sha256=jfZj1TuYWmuSEVT8Yon8bC0GWJtdynWwugbgZEJsQKY,35389
+dv_flow/mgr/package_loader.py,sha256=bYkTXr3PS0xhi3AO8pxvqyNB9RPQRePcy6gUWJOBnvY,34889
 dv_flow/mgr/package_node.py,sha256=CccD2ECiIXy9JBkRR3c7qDxeBiLiPbRT9CqR-Al_niI,214
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=9uO-7UI4OotYixQBo8Nwb2o8FQRFxxJylYCZm9rjt48,1917
@@ -38,7 +38,7 @@ 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=pqzazJjA36g-ETuvxfEl6JV6035koJJPqSF_L-Egtgg,32716
 dv_flow/mgr/task_graph_dot_writer.py,sha256=qK4Imy9o2_F1aKoU1tJ-qoBHslq2BhSMbdjAUPfpN7I,6009
-dv_flow/mgr/task_listener_log.py,sha256=Ai-6X5BOoGsaNTgnlXEW0-czrjJm7__ShNK501CUmko,4337
+dv_flow/mgr/task_listener_log.py,sha256=5skg1QAp3jmInsjoxI2htul4DKv6ID0T9Z5itk4wudQ,4763
 dv_flow/mgr/task_listener_trace.py,sha256=7B-V2YK8uXd_QSGBq_7USmbe5CleVvwumU0CpsmxZvg,6224
 dv_flow/mgr/task_node.py,sha256=OC3rkeRSFv9wmgkMZ_7eJu7nuXGJcwW_b6FGQM-w7AU,5231
 dv_flow/mgr/task_node_compound.py,sha256=0biBPT_2SpCPJL7DFaFY27_K7kNxJ1taIut3Fv12HXk,3347
@@ -76,9 +76,9 @@ 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/util/cmds/cmd_workspace.py,sha256=egmaIXpe5L-TePwmcfisfrG6tdiTUWSjqa9Za5WChVs,890
-dv_flow_mgr-1.9.14960994514rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.9.14960994514rc0.dist-info/METADATA,sha256=dyvqC49RYtsFFrDxcmaUsRwcqRkmFpEsBomitexCeEM,13335
-dv_flow_mgr-1.9.14960994514rc0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-dv_flow_mgr-1.9.14960994514rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.9.14960994514rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.9.14960994514rc0.dist-info/RECORD,,
+dv_flow_mgr-1.9.14984445659rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.9.14984445659rc0.dist-info/METADATA,sha256=b3MThxkBzbiwjPJ2n-9_BBAbtJpe5H2qP9wQTsv-too,13335
+dv_flow_mgr-1.9.14984445659rc0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+dv_flow_mgr-1.9.14984445659rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.9.14984445659rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.9.14984445659rc0.dist-info/RECORD,,