dv-flow-mgr 1.0.0.14483154884a1__py3-none-any.whl → 1.0.0.14504336776a1__py3-none-any.whl

dv_flow/mgr/package.py

@@ -24,6 +24,7 @@ import logging
 from typing import Any, ClassVar, Dict, List
 from .fragment_def import FragmentDef
 from .package_def import PackageDef
+from .srcinfo import SrcInfo
 from .task import Task
 
 @dc.dataclass
@@ -37,6 +38,7 @@ class Package(object):
     types : Dict[str,Any] = 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)
+    srcinfo : SrcInfo = None
     _log : ClassVar = logging.getLogger("Package")
 
     @property

dv_flow/mgr/package_loader.py

@@ -11,6 +11,7 @@ from .fragment_def import FragmentDef
 from .package_def import PackageDef
 from .package import Package
 from .ext_rgy import ExtRgy
+from .srcinfo import SrcInfo
 from .task import Task
 from .task_def import TaskDef, PassthroughE, ConsumesE, RundirE
 from .task_data import TaskMarker, TaskMarkerLoc, SeverityE
@@ -50,6 +51,7 @@ class LoaderScope(SymbolScope):
 
     def findType(self, name) -> Task:
         last_dot = name.rfind('.')
+        pkg = None
         if last_dot != -1:
             pkg_name = name[:last_dot]
             task_name = name[last_dot+1:]
@@ -59,6 +61,7 @@ class LoaderScope(SymbolScope):
             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 and name in pkg.task_m.keys():
@@ -168,6 +171,7 @@ class PackageLoader(object):
 
     def load(self, root) -> Package:
         self._log.debug("--> load %s" % root)
+        root = os.path.normpath(root)
         ret = self._loadPackage(root, None)
         self._log.debug("<-- load %s" % root)
         return ret
@@ -182,6 +186,7 @@ class PackageLoader(object):
             pp = self.pkg_rgy.findPackagePath(nn)
             if pp is None:
                 raise Exception("Package %s not found" % nn)
+            root = os.path.normpath(pp)
             pp_n = self._loadPackage(pp)
             pkg.pkg_m[pp_n.name] = pp_n
         self._log.debug("<-- load_rgy %s" % name)
@@ -264,28 +269,34 @@ class PackageLoader(object):
 
     def _mkPackage(self, pkg_def : PackageDef, root : str) -> Package:
         self._log.debug("--> _mkPackage %s" % pkg_def.name)
-        pkg = Package(pkg_def, os.path.dirname(root))
-
-        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))
-            pkg_scope.pkg.pkg_m[pkg.name] = pkg
+        pkg = Package(
+            pkg_def, 
+            os.path.dirname(root),
+            srcinfo=SrcInfo(file=root))
 
         if pkg.name in self._pkg_m.keys():
-            raise Exception("Duplicate package %s" % pkg.name)
+            epkg = self._pkg_m[pkg.name]
+            if epkg.srcinfo.file != pkg.srcinfo.file:
+                self.error("Package %s already loaded from %s. Duplicate defined in %s" % (
+                    pkg.name, epkg.srcinfo.file, pkg.srcinfo.file))
+        else:
+            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))
+                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))
-        # Imports are loaded first
-        self._loadPackageImports(pkg, pkg_def.imports, pkg.basedir)
+            self._pkg_m[pkg.name] = pkg
+            self._pkg_s.append(PackageScope(name=pkg.name, pkg=pkg, loader=self._loader_scope))
+            # Imports are loaded first
+            self._loadPackageImports(pkg, pkg_def.imports, pkg.basedir)
 
-        taskdefs = pkg_def.tasks.copy()
+            taskdefs = pkg_def.tasks.copy()
 
-        self._loadFragments(pkg, pkg_def.fragments, pkg.basedir, taskdefs)
+            self._loadFragments(pkg, pkg_def.fragments, pkg.basedir, taskdefs)
 
-        self._loadTasks(pkg, taskdefs, pkg.basedir)
+            self._loadTasks(pkg, taskdefs, pkg.basedir)
 
-        self._pkg_s.pop()
+            self._pkg_s.pop()
 
         self._log.debug("<-- _mkPackage %s (%s)" % (pkg_def.name, pkg.name))
         return pkg
@@ -342,6 +353,7 @@ class PackageLoader(object):
             sub_pkg = self._pkg_path_m[imp_path]
         else:
             self._log.info("Loading imported file %s" % imp_path)
+            imp_path = os.path.normpath(imp_path)
             sub_pkg = self._loadPackage(imp_path)
             self._log.info("Loaded imported package %s" % sub_pkg.name)
 
@@ -700,10 +712,10 @@ class PackageLoader(object):
     
     def error(self, msg, loc=None):
         if loc is not None:
-            marker = TaskMarker(msg=msg, severity=TaskMarker.SeverityE.Error,
+            marker = TaskMarker(msg=msg, severity=SeverityE.Error,
                                 loc=loc)
         else:
-            marker = TaskMarker(msg=msg, severity=TaskMarker.SeverityE.Error)
+            marker = TaskMarker(msg=msg, severity=SeverityE.Error)
         self.marker(marker)
 
     def marker(self, marker):

{dv_flow_mgr-1.0.0.14483154884a1.dist-info → dv_flow_mgr-1.0.0.14504336776a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 1.0.0.14483154884a1
+Version: 1.0.0.14504336776a1
 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.0.0.14483154884a1.dist-info → dv_flow_mgr-1.0.0.14504336776a1.dist-info}/RECORD

@@ -15,10 +15,10 @@ dv_flow/mgr/listener_list.py,sha256=BfqvEO2AyJvyc4ClU-hPgDPqWSlqvSdG-yaFEHvUrMc,
 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=PvOuNfuy-SlaiMDzT5SU48OlPJrhS9vpNCgX06KNyTo,2336
+dv_flow/mgr/package.py,sha256=Fq4jCVqEzOhI3lLU9nIi5v9xLzsYbjxDLa7o_Oy9X4w,2394
 dv_flow/mgr/package_def.py,sha256=-UyeFb_0Sj16RtS2vxtIxTfl-oW7adJjM1I3ZSjcRpc,5729
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
-dv_flow/mgr/package_loader.py,sha256=xNdN9aNVRDzSeU2YDMEk6rWPfNphQniehg1UdW91w-k,25361
+dv_flow/mgr/package_loader.py,sha256=MG_lAh-hUqXNIhuse6gksARHvJY0vw_e53peFYN7rZo,25884
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=hOBBRLiXJ5DakXkhrLCBAQ9GPlgq-QS52r0aflmIgbg,1832
 dv_flow/mgr/param_ref_eval.py,sha256=5yH37oIX6f2qmk7GfRgNT5qZx0jm3CJFgB9lLDZZ1yQ,1981
@@ -66,9 +66,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=cBNt3JJ0PGLlUQFTtBLi12i2j_9gNgSBtKdwS3VfF5Y,1566
 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-1.0.0.14483154884a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.0.0.14483154884a1.dist-info/METADATA,sha256=iL73Nvm0NtyhMSruwRPOlibetboR2gQ48kNJ07dHP88,13336
-dv_flow_mgr-1.0.0.14483154884a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-1.0.0.14483154884a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.0.0.14483154884a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.0.0.14483154884a1.dist-info/RECORD,,
+dv_flow_mgr-1.0.0.14504336776a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.0.0.14504336776a1.dist-info/METADATA,sha256=AOnJoFZGkPuich1lLYwO610kIK_frdXdhEJ25XskPng,13336
+dv_flow_mgr-1.0.0.14504336776a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-1.0.0.14504336776a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.0.0.14504336776a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.0.0.14504336776a1.dist-info/RECORD,,