dv-flow-mgr 0.0.1.12952658757a1__py3-none-any.whl → 0.0.1.12960224342a1__py3-none-any.whl

dv_flow/mgr/package.py

@@ -32,6 +32,8 @@ class Package(object):
     tasks : Dict[str,TaskCtor] = dc.field(default_factory=dict)
 
     def getTaskCtor(self, name : str) -> TaskCtor:
+        if name not in self.tasks.keys():
+            raise Exception("Task %s not present in package %s" % (name, self.name))
         return self.tasks[name]
             
     def __hash__(self):

dv_flow/mgr/package_def.py

@@ -23,11 +23,12 @@ import os
 import json
 import yaml
 import importlib
+import logging
 import sys
 import pydantic
 import pydantic.dataclasses as dc
 from pydantic import BaseModel
-from typing import Any, Dict, List, Callable, Tuple
+from typing import Any, Dict, List, Callable, Tuple, ClassVar
 from .fragment_def import FragmentDef
 from .package import Package
 from .package_import_spec import PackageImportSpec, PackageSpec
@@ -49,6 +50,7 @@ class PackageDef(BaseModel):
 #    import_m : Dict['PackageSpec','Package'] = dc.Field(default_factory=dict)
 
     basedir : str = None
+    _log : ClassVar = logging.getLogger("PackageDef")
 
     def getTask(self, name : str) -> 'TaskDef':
         for t in self.tasks:
@@ -56,6 +58,7 @@ class PackageDef(BaseModel):
                 return t
     
     def mkPackage(self, session, params : Dict[str,Any] = None) -> 'Package':
+        self._log.debug("--> mkPackage %s" % self.name)
         ret = Package(self.name)
 
         session.push_package(ret, add=True)
@@ -84,6 +87,7 @@ class PackageDef(BaseModel):
 
         session.pop_package(ret)
 
+        self._log.debug("<-- mkPackage %s" % self.name)
         return ret
     
     def mkTaskCtor(self, session, task, srcdir, tasks_m) -> TaskCtor:
@@ -166,7 +170,7 @@ class PackageDef(BaseModel):
             field_m = {}
             # First, add parameters from the base class
             for fname,info in ctor_t.param_ctor.model_fields.items():
-                print("Field: %s (%s)" % (fname, info.default))
+                self._log.debug("Field: %s (%s)" % (fname, info.default))
                 field_m[fname] = (info.annotation, info.default)
             ptype_m = {
                 "str" : str,
@@ -207,7 +211,7 @@ class PackageDef(BaseModel):
                         raise Exception("No value specified for param %s: %s" % (
                             p, str(param)))
                     field_m[p] = (field_m[p][0], value)
-            print("field_m: %s" % str(field_m))
+            self._log.debug("field_m: %s" % str(field_m))
             ctor_t.param_ctor = pydantic.create_model(
                 "Task%sParams" % task.name, **field_m)
         else:
@@ -230,7 +234,7 @@ class PackageDef(BaseModel):
         file_s.append(root)
         ret = None
         with open(root, "r") as fp:
-            print("open %s" % root)
+            PackageDef._log.debug("open %s" % root)
             doc = yaml.load(fp, Loader=yaml.FullLoader)
             if "package" not in doc.keys():
                 raise Exception("Missing 'package' key in %s" % root)
@@ -288,7 +292,7 @@ class PackageDef(BaseModel):
 
         with open(file, "r") as fp:
             doc = yaml.load(fp, Loader=yaml.FullLoader)
-            print("doc: %s" % str(doc), flush=True)
+            PackageDef._log.debug("doc: %s" % str(doc), flush=True)
             if "fragment" in doc.keys():
                 # Merge the package definition
                 frag = FragmentDef(**(doc["fragment"]))

dv_flow/mgr/pkg_rgy.py

@@ -20,6 +20,7 @@
 #*
 #****************************************************************************
 import os
+import logging
 import sys
 from typing import Dict, Tuple
 from .package_def import PackageDef
@@ -30,6 +31,7 @@ class PkgRgy(object):
     def __init__(self):
         self._pkgpath = []
         self._pkg_m : Dict[str, Tuple[str,PackageDef]] = {}
+        self._log = logging.getLogger(type(self).__name__)
 
     def hasPackage(self, name, search_path=True):
         if name in self._pkg_m.keys():
@@ -108,7 +110,7 @@ class PkgRgy(object):
                                 name, self._pkg_m[name][0], path))
                         self._pkg_m[name] = (path, None)
             except Exception as e:
-                print("Error loading plugin %s: %s" % (p.name, str(e)))
+                self._log.critical("Error loading plugin %s: %s" % (p.name, str(e)))
                 raise e
 
         # self._pkgs = {}

dv_flow/mgr/task_graph_builder.py

@@ -21,6 +21,7 @@
 #****************************************************************************
 import os
 import dataclasses as dc
+import logging
 from .package import Package
 from .package_def import PackageDef, PackageSpec
 from .pkg_rgy import PkgRgy
@@ -37,11 +38,14 @@ class TaskGraphBuilder(object):
     _pkg_m : Dict[PackageSpec,Package] = 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)
+    _logger : logging.Logger = None
 
     def __post_init__(self):
         if self.pkg_rgy is None:
             self.pkg_rgy = PkgRgy.inst()
 
+        self._logger = logging.getLogger(type(self).__name__)
+
         if self.root_pkg is not None:
             self._pkg_spec_s.append(self.root_pkg)
             pkg = self.root_pkg.mkPackage(self)
@@ -82,7 +86,7 @@ class TaskGraphBuilder(object):
 
         rundir = os.path.join(parent_rundir, pkg_name, task_name)
 
-        print("pkg_spec: %s" % str(pkg_spec))
+        self._logger.debug("pkg_spec: %s" % str(pkg_spec))
         self._pkg_spec_s.append(pkg_spec)
         pkg = self.getPackage(pkg_spec)
         
@@ -100,7 +104,7 @@ class TaskGraphBuilder(object):
             depends.append(self._task_m[dep])
 
         # The returned task should have all param references resolved
-        print("task_ctor=%s" % str(ctor_t.task_ctor), flush=True)
+        self._logger.debug("task_ctor=%s" % str(ctor_t.task_ctor))
         task = ctor_t.task_ctor(
             name=task_name,
             params=ctor_t.mkParams(),
@@ -117,7 +121,7 @@ class TaskGraphBuilder(object):
 
     def getPackage(self, spec : PackageSpec) -> Package:
         # Obtain the active package definition
-        print("getPackage: %s len: %d" % (spec.name, len(self._pkg_spec_s)))
+        self._logger.debug("--> getPackage: %s len: %d" % (spec.name, len(self._pkg_spec_s)))
         if len(self._pkg_spec_s) > 0:
             pkg_spec = self._pkg_spec_s[-1]
             if self.root_pkg.name == pkg_spec.name:
@@ -130,7 +134,8 @@ class TaskGraphBuilder(object):
         # Need a stack to track which package we are currently in
         # Need a map to get a concrete package from a name with parameterization
 
-        print("pkg_s: %d %s" % (len(self._pkg_s), (self._pkg_s[-1].name if len(self._pkg_s) else "<unknown>")))
+        self._logger.debug("pkg_s: %d %s" % (
+            len(self._pkg_s), (self._pkg_s[-1].name if len(self._pkg_s) else "<unknown>")))
 
         # Note: _pkg_m needs to be context specific, such that imports from
         # one package don't end up visible in another
@@ -143,9 +148,9 @@ class TaskGraphBuilder(object):
 
             if pkg_def is not None:
                 # Look for an import alias
-                print("imports: %s" % str(pkg_def.imports))
+                self._logger.debug("imports: %s" % str(pkg_def.imports))
                 for imp in pkg_def.imports:
-                    print("imp: %s" % str(imp))
+                    self._logger.debug("imp: %s" % str(imp))
                     if imp.alias is not None and imp.alias == spec.name:
                         # Found the alias name. Just need to get an instance of this package
                         tgt_pkg_spec = PackageSpec(imp.name)
@@ -153,14 +158,12 @@ class TaskGraphBuilder(object):
                             pkg = self._pkg_m[tgt_pkg_spec]
                         elif self.pkg_rgy.hasPackage(tgt_pkg_spec.name):
                             base = self.pkg_rgy.getPackage(tgt_pkg_spec.name)
-                            pkg_m = self._pkg_m
-                            self._pkg_m = {}
+                            self._pkg_spec_s.append(base)
                             pkg = base.mkPackage(self, spec.params)
-                            self._pkg_m = pkg_m
-                            self._pkg_m[spec] = pkg
+                            self._pkg_spec_s.pop()
                         elif imp.path is not None:
                             # See if we can load the package
-                            print("TODO: load referenced package")
+                            self._logger.critical("TODO: load referenced package")
                         else:
                             raise Exception("Failed to resolve target (%s) of import alias %s" % (
                                 imp.name,
@@ -174,28 +177,28 @@ class TaskGraphBuilder(object):
                             base = self.pkg_rgy.getPackage(spec.name)
                             if base is None:
                                 raise Exception("Failed to find imported package %s" % spec.name)
+                            self._pkg_spec_s.append(base)
                             pkg = base.mkPackage(self, spec.params)
-                            pkg_m = self._pkg_m
-                            self._pkg_m = {}
-                            self._pkg_m = pkg_m
                             self._pkg_m[spec] = pkg
+                            self._pkg_spec_s.pop()
                             break
             
             if pkg is None:
-                print("Checking registry")
+                self._logger.debug("Checking registry")
                 p_def =  self.pkg_rgy.getPackage(spec.name)
 
                 if p_def is not None:
-                    pkg_m = self._pkg_m
-                    self._pkg_m = {}
+                    self._pkg_spec_s.append(p_def)
                     pkg = p_def.mkPackage(self)
-                    self._pkg_m = pkg_m
+                    self._pkg_spec_s.pop()
                     self._pkg_m[spec] = pkg
 
             if pkg is None:
                 raise Exception("Failed to find package %s from package %s" % (
                     spec.name, (pkg_def.name if pkg_def is not None else "<null>")))
 
+        self._logger.debug("<-- getPackage: %s" % str(pkg))
+
         return pkg
         
     def getTaskCtor(self, spec : TaskSpec, pkg : PackageDef = None) -> 'TaskCtor':
@@ -213,7 +216,7 @@ class TaskGraphBuilder(object):
             try:
                 pkg = self.getPackage(PackageSpec(pkg_name))
             except Exception as e:
-                print("Failed to find package %s while looking for task %s" % (pkg_name, spec.name))
+                self._logger.critical("Failed to find package %s while looking for task %s" % (pkg_name, spec.name))
                 raise e
 
         return pkg.getTaskCtor(task_name)

{dv_flow_mgr-0.0.1.12952658757a1.dist-info → dv_flow_mgr-0.0.1.12960224342a1.dist-info}/METADATA

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

@@ -2,14 +2,14 @@ dv_flow/mgr/__init__.py,sha256=IZA7I1u7RH34DrJXSkETxWFpK5Jn_A2zXfnCAzJ8XxA,289
 dv_flow/mgr/__main__.py,sha256=big-RSuqbx7P48_8rzaZKX5YW3B2US1i0mRH_TfoeIs,1340
 dv_flow/mgr/fileset.py,sha256=FNvC5sU2ArxJ0OO3v8dXTv8zX-bZ5t0a0ljne0fQQ1o,1150
 dv_flow/mgr/fragment_def.py,sha256=p5i6ONtBWlDHTBFsduu3Z36_76Bn8PCIylp_xoZ7jfQ,1552
-dv_flow/mgr/package.py,sha256=7G_ZQaTHin_mcwQu1PRsGmqfKAbdu9IC5HeLXtPgBDc,1342
-dv_flow/mgr/package_def.py,sha256=BWErUHH82dKTT82-dt-Q_Pls8faH9co5EZJLayL5eqo,11352
+dv_flow/mgr/package.py,sha256=LAJNVOMlpWkez7eK7yfChoDKeIPakApUCpDh_No059g,1469
+dv_flow/mgr/package_def.py,sha256=ay4bYuzBEzrqqJsNr1ezZF9BxEAgWeS9xxIETKe-Bzs,11595
 dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
-dv_flow/mgr/pkg_rgy.py,sha256=ej8VyWH8BWdDNVqk3cSJgQq4h3bW1rgj6uCxUr7gfH8,4384
+dv_flow/mgr/pkg_rgy.py,sha256=2R_EaeBDJn5qUq9DzSnLc37wUP36MWSv-p0LgUjJRAg,4471
 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=vMT_VOqolaS4sQLVfOLm84Ii3sdI0pRVPwH6iVk68Tc,8405
+dv_flow/mgr/task_graph_builder.py,sha256=2AxCa3tFfaoEv8Epk4jWKA5FfVpijgmBVbGQN4JTREc,8569
 dv_flow/mgr/task_graph_runner.py,sha256=NwNYcOJ952lPMLwIIlYE9CoDdedqvcw2fWHYUsKFXuU,2164
 dv_flow/mgr/task_graph_runner_local.py,sha256=UTBV1AKanLns99CSYtEQQ3EEkgo1hM8XsHpc8E5jkIg,4646
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
@@ -20,9 +20,9 @@ dv_flow/mgr/std/fileset.py,sha256=0eBp0VIkxYbIYAt0YJg0m-6nUbPuzGkaVBtxpius7Cg,23
 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_null.py,sha256=UEJ3fIoIMYWVsagiQC7GHD23UES7WoH4wtq94b4tcs4,265
-dv_flow_mgr-0.0.1.12952658757a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.12952658757a1.dist-info/METADATA,sha256=1o1X3i_PDwt_FRk8r3WlXtFPP0wA5OADxgvg2rTKsdE,13276
-dv_flow_mgr-0.0.1.12952658757a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dv_flow_mgr-0.0.1.12952658757a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.12952658757a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.12952658757a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.12960224342a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.12960224342a1.dist-info/METADATA,sha256=YyEPdvYOABMUKB2gBAb6caXOqs6YcYzIuIEWiuaJqfA,13276
+dv_flow_mgr-0.0.1.12960224342a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dv_flow_mgr-0.0.1.12960224342a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.12960224342a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.12960224342a1.dist-info/RECORD,,