dv-flow-mgr 0.0.1.13707193513a1__py3-none-any.whl → 0.0.1.13711323919a1__py3-none-any.whl

dv_flow/mgr/package_def.py

@@ -29,7 +29,7 @@ import sys
 import pydantic
 import pydantic.dataclasses as dc
 from pydantic import BaseModel
-from typing import Any, Dict, List, Callable, Tuple, ClassVar
+from typing import Any, Dict, List, Callable, Tuple, ClassVar, Union
 from .fragment_def import FragmentDef
 from .package import Package
 from .package_import_spec import PackageImportSpec, PackageSpec
@@ -45,11 +45,12 @@ class PackageDef(BaseModel):
     params : Dict[str,Any] = dc.Field(default_factory=dict)
     type : List[PackageSpec] = dc.Field(default_factory=list)
     tasks : List[TaskDef] = dc.Field(default_factory=list)
-    imports : List[PackageImportSpec] = dc.Field(default_factory=list)
+    imports : List[Union[str,PackageImportSpec]] = dc.Field(default_factory=list)
     fragments: List[str] = dc.Field(default_factory=list)
     types : List[TypeDef] = dc.Field(default_factory=list)
 
     fragment_l : List['FragmentDef'] = dc.Field(default_factory=list, exclude=True)
+    subpkg_m : Dict[str,'PackageDef'] = dc.Field(default_factory=dict, exclude=True)
 
 #    import_m : Dict['PackageSpec','Package'] = dc.Field(default_factory=dict)
 
@@ -281,13 +282,13 @@ class PackageDef(BaseModel):
         self._log.debug("<-- _getParamT %s" % task.name)
         return params_t
 
-    @staticmethod
-    def load(path, exp_pkg_name=None):
+    @classmethod
+    def load(cls, path, exp_pkg_name=None):
         return PackageDef._loadPkgDef(path, exp_pkg_name, [])
         pass
 
-    @staticmethod
-    def _loadPkgDef(root, exp_pkg_name, file_s):
+    @classmethod
+    def _loadPkgDef(cls, root, exp_pkg_name, file_s):
         if root in file_s:
             raise Exception("Recursive file processing @ %s: %s" % (root, ",".join(file_s)))
         file_s.append(root)
@@ -326,6 +327,30 @@ class PackageDef(BaseModel):
         for spec in pkg.fragments:
             PackageDef._loadFragmentSpec(pkg, spec, file_s)
 
+        if len(pkg.imports) > 0:
+            cls._log.info("Loading imported packages (basedir=%s)" % pkg.basedir)
+        for imp in pkg.imports:
+            if type(imp) == str:
+                imp_path = imp
+            elif imp.path is not None:
+                imp_path = imp.path
+            else:
+                raise Exception("imp.path is none: %s" % str(imp))
+            
+            cls._log.info("Loading imported package %s" % imp_path)
+
+            if not os.path.isabs(imp_path):
+                cls._log.debug("basedir: %s ; imp_path: %s" % (pkg.basedir, imp_path))
+                imp_path = os.path.join(pkg.basedir, imp_path)
+            if not os.path.isfile(imp_path):
+                raise Exception("Import file %s not found" % imp_path)
+
+            cls._log.info("Loading file %s" % imp_path)
+                
+            sub_pkg = PackageDef.load(imp_path)
+            cls._log.info("Loaded imported package %s" % sub_pkg.name)
+            pkg.subpkg_m[sub_pkg.name] = sub_pkg
+
         file_s.pop()
 
         return pkg

dv_flow/mgr/package_import_spec.py

@@ -46,6 +46,6 @@ class PackageSpec(object):
         return isinstance(value, PackageSpec) and value.get_fullname() == self.get_fullname()
 
 @dc.dataclass
-class PackageImportSpec(PackageSpec):
+class PackageImportSpec(object):
     path : str = dc.Field(default=None, alias="from")
     alias : str = dc.Field(default=None, alias="as")

dv_flow/mgr/pkg_rgy.py

@@ -42,6 +42,7 @@ class PkgRgy(object):
             return False
     
     def getPackage(self, name):
+        self._log.debug("--> getPackage(%s)" % name)
         if name in self._pkg_m.keys():
             if self._pkg_m[name][1] is None:
                 pkg_def = PackageDef.load(self._pkg_m[name][0])
@@ -50,9 +51,11 @@ class PkgRgy(object):
                     self._pkg_m[name][0],
                     pkg_def
                 )
-            return self._pkg_m[name][1]
+            ret = self._pkg_m[name][1]
         else:
-            return self._findOnPath(name)
+            ret = self._findOnPath(name)
+        self._log.debug("<-- getPackage(%s)" % name)
+        return ret
         
     def _findOnPath(self, name):
         name_s = name.split('.')
@@ -79,9 +82,11 @@ class PkgRgy(object):
         return pkg
 
     def registerPackage(self, pkg_def):
+        self._log.debug("--> registerPackage %s" % pkg_def.name)
         if pkg_def.name in self._pkg_m.keys():
             raise Exception("Duplicate package %s" % pkg_def.name)
-        self._pkg_m[pkg_def.name] = pkg_def
+        self._pkg_m[pkg_def.name] = (pkg_def.basedir, pkg_def)
+        self._log.debug("<-- registerPackage %s" % pkg_def.name)
 
     def _discover_plugins(self):
         # Register built-in package

dv_flow/mgr/task_graph_builder.py

@@ -46,13 +46,23 @@ class TaskGraphBuilder(object):
             self.pkg_rgy = PkgRgy.inst()
 
         self._logger = logging.getLogger(type(self).__name__)
+        self._logger.debug("TaskGraphBuilder: root_pkg: %s" % str(self.root_pkg))
 
         if self.root_pkg is not None:
+
+            # Register package definitions found during loading
+            for subpkg in self.root_pkg.subpkg_m.values():
+                self._logger.debug("Registering package %s" % subpkg.name)
+                self.pkg_rgy.registerPackage(subpkg)
+
             self._pkg_spec_s.append(self.root_pkg)
             pkg = self.root_pkg.mkPackage(self)
             self._pkg_spec_s.pop()
+
+            # Allows us to find ourselves
             self._pkg_m[PackageSpec(self.root_pkg.name)] = pkg
 
+
     def push_package(self, pkg : Package, add=False):
         self._pkg_s.append(pkg)
         if add:
@@ -150,12 +160,13 @@ class TaskGraphBuilder(object):
             self._logger.debug("Search package %s for import alias %s" % (
                 pkg_def.name, pkg_spec.name))
             for imp in pkg_def.imports:
-                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
-                    self._logger.debug("Found alias %s -> %s" % (imp.alias, imp.name))
-                    pkg_name = imp.name
-                    break
+                if type(imp) != str:
+                    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
+                        self._logger.debug("Found alias %s -> %s" % (imp.alias, imp.name))
+                        pkg_name = imp.name
+                        break
 
         # Note: _pkg_m needs to be context specific, such that imports from
         # one package don't end up visible in another

dv_flow/mgr/task_listener_log.py

@@ -5,7 +5,7 @@ from rich.console import Console
 class TaskListenerLog(object):
     console : Console = dc.field(default_factory=Console)
     level : int = 0
-    quiet : bool = True
+    quiet : bool = False
 
     def event(self, task : 'Task', reason : 'Reason'):
         if reason == 'enter':

{dv_flow_mgr-0.0.1.13707193513a1.dist-info → dv_flow_mgr-0.0.1.13711323919a1.dist-info}/METADATA

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

@@ -7,23 +7,23 @@ dv_flow/mgr/fileset.py,sha256=_EhtqBVn0prylXJhR3dUV2p7ocGHzNAF_ZtYNgeKJhs,1240
 dv_flow/mgr/fragment_def.py,sha256=cyzp1XeWtNOaagScmeS-BPsoXj9j2LTBbKq5ZUioz8I,1641
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=878twhPD-E1pFlDNUtuyeFEgJ_Y89b560og4St-Iwrs,1679
-dv_flow/mgr/package_def.py,sha256=q8lT8MlDF7nDYTBqtPVQSXdGeN06kceZ3qBH7WhP0Bs,14917
-dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
+dv_flow/mgr/package_def.py,sha256=NQlXqdGoqIEFDHbO-A4tDEc_JF3m4fdBgKOjwh6J7jA,16034
+dv_flow/mgr/package_import_spec.py,sha256=K5bwbO82A7MB5WeR7kmzWk7wQmQbQVMG1BOtpSPKQRU,1755
 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=2R_EaeBDJn5qUq9DzSnLc37wUP36MWSv-p0LgUjJRAg,4471
+dv_flow/mgr/pkg_rgy.py,sha256=VSk5Uq4XP2DVITsxzfJY75s54Th4PKMrBPd535BHGAs,4743
 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=fEqJalmDDDzayJbuyDWAcmumDGK3XgnZmcScoBY8HGg,7887
+dv_flow/mgr/task_graph_builder.py,sha256=Z4-_D5a8dtrvd6hEIym-jrgkAC8l9INsXXOsO1nQZG0,8327
 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
-dv_flow/mgr/task_listener_log.py,sha256=u7hm8Q8ZVCIY25mNQEI3DIgSMJ_zJ5nbvqukGMXyido,934
+dv_flow/mgr/task_listener_log.py,sha256=3IlOQmTpdyDL-PwV8zWW2oV5lpY5LD9BFEHMxdiECFE,935
 dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
 dv_flow/mgr/task_node.py,sha256=leuQC3IPyZQsJKQwKBTQgvstXxH7Fk10eDINoaK7718,12212
 dv_flow/mgr/task_output.py,sha256=dkJhhNRFGFQSkVsw_bGirK0_0ghTxBYq1LjRMZCVWnA,245
@@ -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.13707193513a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13707193513a1.dist-info/METADATA,sha256=QKD3uz-v-roPMUvXpRfmEgwEGJ144TDe5gdbh-ia5z4,13314
-dv_flow_mgr-0.0.1.13707193513a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-dv_flow_mgr-0.0.1.13707193513a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13707193513a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13707193513a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13711323919a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13711323919a1.dist-info/METADATA,sha256=Cvh0TWgztkYp9dPFbbkrfmLSQ4KgbQ21DBdnppeSk1g,13314
+dv_flow_mgr-0.0.1.13711323919a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+dv_flow_mgr-0.0.1.13711323919a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13711323919a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13711323919a1.dist-info/RECORD,,