dv-flow-mgr 1.10.15546818223rc0__py3-none-any.whl → 1.10.15799221980rc0__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.10.0"
-SUFFIX="15546818223rc0"
+SUFFIX="15799221980rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/cmds/cmd_graph.py

@@ -28,6 +28,7 @@ from ..task_graph_builder import TaskGraphBuilder
 from ..task_runner import TaskSetRunner
 from ..task_listener_log import TaskListenerLog
 from ..task_graph_dot_writer import TaskGraphDotWriter
+from .util import get_rootdir
 
 
 class CmdGraph(object):
@@ -35,16 +36,8 @@ class CmdGraph(object):
 
     def __call__(self, args):
 
-        if args.root is not None:
-            rootdir = args.root
-        elif "DV_FLOW_ROOT" in os.environ.keys():
-            rootdir = os.environ["DV_FLOW_ROOT"]
-        else:
-            rootdir = os.getcwd()
-
-
         # First, find the project we're working with
-        pkg = loadProjPkgDef(rootdir)
+        pkg = loadProjPkgDef(get_rootdir(args))
 
         if pkg is None:
             raise Exception("Failed to find a 'flow.dv' file that defines a package in %s or its parent directories" % os.getcwd())

dv_flow/mgr/cmds/cmd_run.py

@@ -31,24 +31,19 @@ from ..task_graph_builder import TaskGraphBuilder
 from ..task_runner import TaskSetRunner
 from ..task_listener_log import TaskListenerLog
 from ..task_listener_trace import TaskListenerTrace
+from .util import get_rootdir
 
 
 class CmdRun(object):
     _log : ClassVar = logging.getLogger("CmdRun")
 
     def __call__(self, args):
-        if args.root is not None:
-            rootdir = args.root
-        elif "DV_FLOW_ROOT" in os.environ.keys():
-            rootdir = os.environ["DV_FLOW_ROOT"]
-        else:
-            rootdir = os.getcwd()
 
         rgy = ExtRgy.inst()
 
         # First, find the project we're working with
         listener = TaskListenerLog()
-        pkg = loadProjPkgDef(rootdir, listener=listener.marker)
+        pkg = loadProjPkgDef(get_rootdir(args), listener=listener.marker)
 
         if listener.has_severity[SeverityE.Error] > 0:
             print("Error(s) encountered while loading package definition")

dv_flow/mgr/cmds/cmd_show.py

@@ -29,6 +29,7 @@ from ..task_graph_builder import TaskGraphBuilder
 from ..task_runner import TaskSetRunner
 from ..task_listener_log import TaskListenerLog
 from ..task_graph_dot_writer import TaskGraphDotWriter
+from .util import get_rootdir
 
 
 class CmdShow(object):
@@ -37,7 +38,7 @@ class CmdShow(object):
     def __call__(self, args):
 
         # First, find the project we're working with
-        pkg = loadProjPkgDef(os.getcwd())
+        pkg = loadProjPkgDef(get_rootdir(args))
 
         if pkg is None:
             raise Exception("Failed to find a 'flow.dv' file that defines a package in %s or its parent directories" % os.getcwd())

dv_flow/mgr/cmds/util.py

@@ -0,0 +1,11 @@
+import os
+
+def get_rootdir(args):
+    rootdir = None
+    if hasattr(args, "root") and args.root is not None:
+        rootdir = args.root
+    elif "DV_FLOW_ROOT" in os.environ.keys():
+        rootdir = os.environ["DV_FLOW_ROOT"]
+    else:
+        rootdir = os.getcwd()
+    return rootdir

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 .param_def import ComplexType
+from .param_ref_eval import ParamRefEval
 from .ext_rgy import ExtRgy
 from .srcinfo import SrcInfo
 from .task import Task, Strategy, StrategyGenerate
@@ -231,6 +232,7 @@ class PackageLoader(object):
     _pkg_s : List[PackageScope] = dc.field(default_factory=list)
     _pkg_m : Dict[str, Package] = dc.field(default_factory=dict)
     _pkg_path_m : Dict[str, Package] = dc.field(default_factory=dict)
+    _eval : ParamRefEval = dc.field(default_factory=ParamRefEval)
     _loader_scope : LoaderScope = None
 
     def __post_init__(self):
@@ -240,6 +242,8 @@ class PackageLoader(object):
         if self.env is None:
             self.env = os.environ.copy()
 
+        self._eval.set("env", self.env)
+
         self._loader_scope = LoaderScope(name=None, loader=self)
 
     def load(self, root) -> Package:
@@ -438,6 +442,10 @@ class PackageLoader(object):
         
         self._log.info("Loading imported package %s" % imp_path)
 
+        if "${{" in imp_path:
+            imp_path = self._eval.eval(imp_path)
+            self._log.info("Import path with expansion: %s" % imp_path)
+
         if not os.path.isabs(imp_path):
             for root in (basedir, os.path.dirname(self._file_s[0])):
                 self._log.debug("Search basedir: %s ; imp_path: %s" % (root, imp_path))
@@ -448,6 +456,10 @@ class PackageLoader(object):
                     self._log.debug("Found root file: %s" % resolved_path)
                     imp_path = resolved_path
                     break
+        else:
+            # absolute path. 
+            if os.path.isdir(imp_path):
+                imp_path = self._findFlowDvInDir(imp_path)
 
         if not os.path.isfile(imp_path):
             self.error("Import file %s not found" % imp_path, pkg.srcinfo)
@@ -466,19 +478,30 @@ class PackageLoader(object):
         pkg.pkg_m[sub_pkg.name] = sub_pkg
         self._log.debug("<-- _loadPackageImport %s" % str(imp))
 
-    def _findFlowDvInDir(self, base, leaf):
+    def _findFlowDvInDir(self, base, leaf=None):
         """Search down the tree looking for a flow.dv file"""
         self._log.debug("--> _findFlowDvInDir (%s, %s)" % (base, leaf))
         imp_path = None
-        if os.path.isfile(os.path.join(base, leaf)):
-            imp_path = os.path.join(base, leaf)
-            self._log.debug("Found: %s" % imp_path)
-        elif os.path.isdir(os.path.join(base, leaf)):
-            if os.path.isfile(os.path.join(base, leaf, "flow.dv")):
-                imp_path = os.path.join(base, leaf, "flow.dv")
-                self._log.debug("Found: %s" % imp_path) 
-            else:
-                imp_path = self._findFlowDvSubdir(os.path.join(base, leaf))
+        for name in ("flow.dv", "flow.yaml", "flow.yml"):
+            if leaf is None:
+                if os.path.isfile(base):
+                    imp_path = base
+                elif os.path.isfile(os.path.join(base, name)):
+                    imp_path = os.path.join(base, name)
+                elif os.path.isdir(base):
+                    imp_path = self._findFlowDvSubdir(base)
+            elif os.path.isfile(os.path.join(base, leaf)):
+                imp_path = os.path.join(base, leaf)
+                self._log.debug("Found: %s" % imp_path)
+            elif os.path.isdir(os.path.join(base, leaf)):
+                if os.path.isfile(os.path.join(base, leaf, name)):
+                    imp_path = os.path.join(base, leaf, name)
+                    self._log.debug("Found: %s" % imp_path) 
+                else:
+                    imp_path = self._findFlowDvSubdir(os.path.join(base, leaf))
+            if imp_path is not None:
+                self._log.debug("Found: %s" % imp_path)
+                break
         self._log.debug("<-- _findFlowDvInDir %s" % imp_path)
         return imp_path
     
@@ -487,11 +510,14 @@ class PackageLoader(object):
         # Search deeper
         ret = None
         for subdir in os.listdir(dir):
-            if os.path.isfile(os.path.join(dir, subdir, "flow.dv")):
-                ret = os.path.join(dir, subdir, "flow.dv")
-                self._log.debug("Found: %s" % ret)
-            elif os.path.isdir(os.path.join(dir, subdir)):
-                ret = self._findFlowDvSubdir(os.path.join(dir, subdir))
+            for name in ("flow.dv", "flow.yaml", "flow.yml"):
+                if os.path.isfile(os.path.join(dir, subdir, name)):
+                    ret = os.path.join(dir, subdir, name)
+                    self._log.debug("Found: %s" % ret)
+                elif os.path.isdir(os.path.join(dir, subdir)):
+                    ret = self._findFlowDvSubdir(os.path.join(dir, subdir))
+                if ret is not None:
+                    break
             if ret is not None:
                 break
         return ret

dv_flow/mgr/util/util.py

@@ -31,14 +31,17 @@ def loadProjPkgDef(path, listener=None):
     ret = None
     found = False
     while dir != "/" and dir != "" and os.path.isdir(dir):
-        if os.path.exists(os.path.join(dir, "flow.dv")):
-            with open(os.path.join(dir, "flow.dv")) as f:
-                data = yaml.load(f, Loader=yaml.FullLoader)
-                if "package" in data.keys():
-                    found = True
-                    listeners = [listener] if listener is not None else []
-                    ret = PackageLoader(marker_listeners=listeners).load(os.path.join(dir, "flow.dv"))
-                    break
+        for name in ("flow.dv", "flow.yaml", "flow.yml"):
+            if os.path.exists(os.path.join(dir, name)):
+                with open(os.path.join(dir, name)) as f:
+                    data = yaml.load(f, Loader=yaml.FullLoader)
+                    if "package" in data.keys():
+                        found = True
+                        listeners = [listener] if listener is not None else []
+                        ret = PackageLoader(marker_listeners=listeners).load(os.path.join(dir, name))
+                        break
+        if found:
+            break
         dir = os.path.dirname(dir)
     
     if not found:

{dv_flow_mgr-1.10.15546818223rc0.dist-info → dv_flow_mgr-1.10.15799221980rc0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=FLH25pZ7BCcqKMfK3iZ0xyJQZ28wy31JyJEJWbA_XvE,1316
+dv_flow/mgr/__init__.py,sha256=ofZc89mZ2Z8he5vLK3xJEdN9Ur4PRgp_JD7uJPvTV4o,1316
 dv_flow/mgr/__main__.py,sha256=yrNrvz-jYEovBGpY1E9aS1iZ9S_9MQv0lT-XUQSp0vc,4141
 dv_flow/mgr/cond_def.py,sha256=2ZkzPusqVkN1fFMTvkDl9O_OJLPdD_cK3xzX9J75RMw,343
 dv_flow/mgr/config.py,sha256=b2MVlVVNB0psk8x4bQRAYshkpNJrtyMtV1Ymhmx9AfM,137
@@ -21,7 +21,7 @@ dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=oKzYQypF-to4OXr8BKwPz7Z8cf7AC6eF6CiYj1jCyTI,4585
 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=okXcF5EqgvKMHSCsEpMtpejhBmnE-QaUDoV4C1yNmdA,35750
+dv_flow/mgr/package_loader.py,sha256=z02_buAgOIRtpNxuYgrdaeDxV6PLYcFGsOcElfH9cqM,36860
 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=GnaolV5QOrjBpqNj9yYo9nnrwEBpp4J_4ZYe14bsfO4,1939
@@ -58,10 +58,11 @@ dv_flow/mgr/task_runner.py,sha256=l1bkVoGerPl1mw4O-JMLGHgDZdWIHukfj5fElbiNizI,10
 dv_flow/mgr/type.py,sha256=hoJTatlPC0yOazKSWduK-5CfY38RPkc6qXFzOCcVSdM,723
 dv_flow/mgr/type_def.py,sha256=4sge3PibO1jDnS0cXdX0PiurcKbDA3kT6rb4DGIKwEM,1176
 dv_flow/mgr/yaml_srcinfo_loader.py,sha256=29BNRiB8Hj1FepkrLtdjHSv5U_85Q432gBeeK80nKEA,1606
-dv_flow/mgr/cmds/cmd_graph.py,sha256=s6EU27myTgXm1MJ2xFb04ndOPEejTXM2Hi7ipT4o110,3181
-dv_flow/mgr/cmds/cmd_run.py,sha256=oFKQ4W1E3SvetY_v4LYAogowDPFZ7S3U7uIqudYe3po,4154
-dv_flow/mgr/cmds/cmd_show.py,sha256=JOIFaVXt8YCf9bKXfq6qzV5wQdxdLHqE-yCj0ecGREs,3755
+dv_flow/mgr/cmds/cmd_graph.py,sha256=VQLm-zoa5xbWNfJNoCnDihKniWW8W_tmCyWZISDzwDo,3006
+dv_flow/mgr/cmds/cmd_run.py,sha256=0wqJpYwmqo9Ou5Tny12A67WqOdUWFgLVKeFy-0R07dA,3981
+dv_flow/mgr/cmds/cmd_show.py,sha256=eNWP-cd3PTF1gfrdG58hzb6Mf5sNOGu1MZaslJ_z4fc,3791
 dv_flow/mgr/cmds/cmd_util.py,sha256=jdT48T_pZozCZUzkNy7tIhYL_kMGjWbV6g92oMYhRww,985
+dv_flow/mgr/cmds/util.py,sha256=S6_wIxDBxzWVxwjmPiY6Wk_AO7sD0OLDw-ENqge6TWc,286
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/create_file.py,sha256=SEpKTQdiY32002C7b4kYfAiK9v_xajixOJU5WftW75I,2957
 dv_flow/mgr/std/data_item.py,sha256=olKtspEVFOvr92reUl4QaQV27UVyjSGIfIWpsy0Myvo,434
@@ -73,12 +74,12 @@ dv_flow/mgr/std/message.py,sha256=0JHLErg8whqMLAasG1fumZ2O7R7WNWeNQ9ibJaLDpVY,10
 dv_flow/mgr/std/task_null.py,sha256=dw6LXBXVwth6gLPeduDvlz5znAhcVpDH8r1DticD-0w,1041
 dv_flow/mgr/util/__init__.py,sha256=6uuA6z5cKS2hcjJw6YyEM2M79g6OpXb6tZF_Gku-AGU,22
 dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,983
-dv_flow/mgr/util/util.py,sha256=Ob2RTJOhanWajatiWJYm2ixuzspVx9hPFjGaaw0oPRI,1924
+dv_flow/mgr/util/util.py,sha256=5wVWpkHn4U-Hcv-skaLaGC0bgoK63NaF-NH-DGpAaRM,2035
 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.10.15546818223rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.10.15546818223rc0.dist-info/METADATA,sha256=Hqaghk9RDnIFdKzSbHxKmuxsqXeZUHWO2bW-6Gh2oDg,13336
-dv_flow_mgr-1.10.15546818223rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dv_flow_mgr-1.10.15546818223rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.10.15546818223rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.10.15546818223rc0.dist-info/RECORD,,
+dv_flow_mgr-1.10.15799221980rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.10.15799221980rc0.dist-info/METADATA,sha256=P5WbF55tMpkrg6XbrLJAAalWv-EzlaTRh5g0DK5RxmY,13336
+dv_flow_mgr-1.10.15799221980rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dv_flow_mgr-1.10.15799221980rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.10.15799221980rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.10.15799221980rc0.dist-info/RECORD,,