dv-flow-mgr 1.9.15431140071rc0__py3-none-any.whl → 1.9.15511554180rc0__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="15431140071rc0"
+SUFFIX="15511554180rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/__main__.py

@@ -26,6 +26,7 @@ from .cmds.cmd_graph import CmdGraph
 from .cmds.cmd_run import CmdRun
 from .cmds.cmd_show import CmdShow
 from .cmds.cmd_util import CmdUtil
+from .ext_rgy import ExtRgy
 
 def get_parser():
     parser = argparse.ArgumentParser(

dv_flow/mgr/cmds/cmd_run.py

@@ -24,6 +24,7 @@ import os
 import logging
 import sys
 from typing import ClassVar
+from ..ext_rgy import ExtRgy
 from ..util import loadProjPkgDef
 from ..task_data import SeverityE
 from ..task_graph_builder import TaskGraphBuilder
@@ -43,6 +44,8 @@ class CmdRun(object):
         else:
             rootdir = os.getcwd()
 
+        rgy = ExtRgy.inst()
+
         # First, find the project we're working with
         listener = TaskListenerLog()
         pkg = loadProjPkgDef(rootdir, listener=listener.marker)

dv_flow/mgr/ext_rgy.py

@@ -119,8 +119,11 @@ class ExtRgy(object):
             try:
                 mod = p.load()
 
-                if hasattr(mod, "dvfm_packages"):
-                    pkg_m = mod.dvfm_packages()
+                if hasattr(mod, "dvfm_packages") or hasattr(mod, "dfm_packages"):
+                    if hasattr(mod, "dvfm_packages"):
+                        pkg_m = mod.dvfm_packages()
+                    else:
+                        pkg_m = mod.dfm_packages()
                     
                     for name,path in pkg_m.items():
                         self._log.debug("Registering package %s: %s" % (name, path))
@@ -129,8 +132,12 @@ class ExtRgy(object):
                                 name, self._pkg_m[name][0], path))
                         else:
                             self._pkg_m[name] = path
-                if hasattr(mod, "dvfm_shells"):
-                    shell_m = mod.dvfm_shells()
+                if hasattr(mod, "dvfm_shells") or hasattr(mod, "dfm_shells"):
+                    if hasattr(mod, "dvfm_shells"):
+                        shell_m = mod.dvfm_shells()
+                    else:
+                        shell_m = mod.dfm_shells()
+
                     for name, shell in shell_m.items():
                         self._log.debug("Registering shell %s" % name)
                         if name in self._shell_m.keys():

dv_flow/mgr/package_loader.py

@@ -331,7 +331,10 @@ class PackageLoader(object):
                         else:
                             loc_s = str(el)
                         if hasattr(obj, "__getitem__"):
-                            obj = obj[el]
+                            try:
+                                obj = obj[el]
+                            except KeyError as ke:
+                                pass
                         if type(obj) == dict and 'srcinfo' in obj.keys():
                             loc = obj['srcinfo']
                     if loc is not None:

dv_flow/mgr/param_def.py

@@ -45,6 +45,7 @@ class VisibilityE(enum.Enum):
 
 class ParamDef(BaseModel):
     doc : str = None
+    desc : str = None
     type : Union[str, 'ComplexType'] = None
 #    derived : bool = Field(default=False)
     value : Union[Any, None] = None

dv_flow/mgr/task_graph_builder.py

@@ -128,9 +128,13 @@ class TaskGraphBuilder(object):
         else:
             self._ctxt = TaskNodeCtxt(
                 root_pkgdir=None,
-                root_rundir=self.rundir)
+                root_rundir=self.rundir,
+                env=self.env)
 
 
+    def setEnv(self, env):
+        self.env.update(env)
+
     def setParam(self, name, value):
         if self.root_pkg is None:
             raise Exception("No root package")
@@ -318,6 +322,7 @@ class TaskGraphBuilder(object):
             task = self.loader.getTask(task_t)
 
             if task is None:
+                type = None
                 if task_t in self._type_m.keys():
                     type = self._type_m[task_t]
                 
@@ -350,6 +355,8 @@ class TaskGraphBuilder(object):
                 task=DataCallable(type.paramT)
             )
             self._task_node_m[name] = ret
+        else:
+            self._log.debug("Fallthrough")
 
         if ret is None:
             if task is None:

dv_flow/mgr/task_runner.py

@@ -37,7 +37,7 @@ class TaskRunner(object):
     env : Dict[str, str] = dc.field(default=None)
 
     # List of [Listener:Callable[Task],Recurisve:bool]
-    listeners : List[Tuple[Callable['Task','Reason'], bool]] = dc.field(default_factory=list)
+    listeners : List[Tuple[Callable[['Task'],'Reason'], bool]] = dc.field(default_factory=list)
 
     _log : ClassVar = logging.getLogger("TaskRunner")
 
@@ -150,8 +150,13 @@ class TaskSetRunner(TaskRunner):
                     # else:
                     #     rundir = self.rundir
 
+                    print("rundir: \"%s\"" % rundir, flush=True)
                     if not os.path.isdir(rundir):
-                        os.makedirs(rundir, exist_ok=True)
+                        try:
+                            os.makedirs(rundir, exist_ok=True)
+                        except Exception as e:
+                            print("Failed to create rundir %s: %s" % (rundir, str(e)), flush=True)
+                            raise e
 
                     self._log.debug("start task %s" % t.name)
                     self._notify(t, "enter")

dv_flow/mgr/util/util.py

@@ -43,8 +43,9 @@ def loadProjPkgDef(path, listener=None):
     
     if not found:
         if listener:
-            listener.marker(TaskMarker(
-                msg="Failed to find a 'flow.dv' file that defines a package in %s or its parent directories" % path))
+            listener(TaskMarker(
+                msg="Failed to find a 'flow.dv' file that defines a package in %s or its parent directories" % path,
+                severity=SeverityE.Error))
     
     return ret
 

{dv_flow_mgr-1.9.15431140071rc0.dist-info → dv_flow_mgr-1.9.15511554180rc0.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
-dv_flow/mgr/__init__.py,sha256=nn0lK2TzY0yAwdD6hk8-45484GHHvXVZ6d8-9f4c-Qw,1315
-dv_flow/mgr/__main__.py,sha256=KrQGbSmZB4iHIh3skCL6pO4TxwoOs5svF2Atu9me9DA,4113
+dv_flow/mgr/__init__.py,sha256=d7UGQ5nsmeSBwBobinK_sOf0T4D9rdqu3bw6Sje5_M4,1315
+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
 dv_flow/mgr/config_def.py,sha256=N5nBc_2VPrx0pCDyIe-VPhQ7ItnbyJqrak3ZiPEAbtI,1040
@@ -9,7 +9,7 @@ dv_flow/mgr/exec_callable.py,sha256=tB2kBJeBPvq8pYOnZCaCvTYeu_MiezFfHUEqTAW3GQA,
 dv_flow/mgr/exec_gen_callable.py,sha256=KLAKgu0c6nrEzfy85qeogH64VOFDBa6anslSBajykOE,3039
 dv_flow/mgr/expr_eval.py,sha256=ojHo3U_QGqm0CWVSEGtFJRo3jrjiTKhy_B58yRNxN8g,4814
 dv_flow/mgr/expr_parser.py,sha256=LMLe4RTbgcQVIpuZIi1vowHsKRgRmzKzomGvlJL8kJI,7110
-dv_flow/mgr/ext_rgy.py,sha256=UD7nvMF5g3GiSYr7iLbk68_67UwzqUE7vsKCTaFrQr8,5788
+dv_flow/mgr/ext_rgy.py,sha256=BBaxSqOvSZcrE8BjG6cY5skCucOmY0j9rADHL55EITM,6119
 dv_flow/mgr/extend_def.py,sha256=Ndh4z4XqqimtoS8-6ZNMDOvkVpVmEaWZsNEPM26PDZ0,653
 dv_flow/mgr/fileset.py,sha256=kSjz-RiuQdKGMVjmbGK5YlwY-vJKSHmgggu-1_H0DHU,1320
 dv_flow/mgr/fragment_def.py,sha256=2qx6KWiHCDvnb9JXnqIOb4n6kemAClAYuBoM6ex6xJE,1696
@@ -21,10 +21,10 @@ 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=AiEUaNsfBAG3J29_Xfax-u0VDmywmsr0AAzORIxUAFY,35625
+dv_flow/mgr/package_loader.py,sha256=okXcF5EqgvKMHSCsEpMtpejhBmnE-QaUDoV4C1yNmdA,35750
 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
+dv_flow/mgr/param_def.py,sha256=GnaolV5QOrjBpqNj9yYo9nnrwEBpp4J_4ZYe14bsfO4,1939
 dv_flow/mgr/param_ref_eval.py,sha256=x15lGEJNkWthXXfX3rRTh6tP7Y7A7cmNdo-iOHeOPKw,2179
 dv_flow/mgr/parser.out,sha256=mWx6hgqORUFhM2OlxV2gp43Y7w3sX2u4ua4t-5wqmck,27566
 dv_flow/mgr/parsetab.py,sha256=S2o2FfobhhVWKwZg_GA7zFg62VwT7tiRxxNZJIyqP98,4351
@@ -36,7 +36,7 @@ dv_flow/mgr/task.py,sha256=XQ-mVyDGvpU4gB6GmnNeTQhxKqFXiblShh7qd_-SIbM,2387
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
 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=7FgVi6UyuCbhJnLFJ2IkmmPqphh7SxhlcbVV5btmLFc,33427
+dv_flow/mgr/task_graph_builder.py,sha256=0lO837SY6Bhw2GE6iwNNQj2sbPTcIZhXr1-TwJBpd7A,33599
 dv_flow/mgr/task_graph_dot_writer.py,sha256=qK4Imy9o2_F1aKoU1tJ-qoBHslq2BhSMbdjAUPfpN7I,6009
 dv_flow/mgr/task_listener_log.py,sha256=XcmBT-946DyrEYwNwbg7ejnB6Q3koybE7AekSWGxNGQ,4774
 dv_flow/mgr/task_listener_trace.py,sha256=7B-V2YK8uXd_QSGBq_7USmbe5CleVvwumU0CpsmxZvg,6224
@@ -54,12 +54,12 @@ dv_flow/mgr/task_node_leaf.py,sha256=nULlu-veyPC-PXdoQhahkLgqpdKNzaoD0XUlCw0EuZ4
 dv_flow/mgr/task_output.py,sha256=ZwyvwnYj_gHOEFAEOH3m24Xfc4Cn77hb1j7LkX8_3C4,1086
 dv_flow/mgr/task_params_ctor.py,sha256=qlrzibGAFHmbqOu88jEoh1wOSFHu68Gwdgc259-50e8,1915
 dv_flow/mgr/task_run_ctxt.py,sha256=1c5dV0xd1XQOTkcqv1qBrXs-gs--nZ1AvLzFb6L5dNY,3967
-dv_flow/mgr/task_runner.py,sha256=hfA4eGOmw-Rzur5qgcUKEwQB97Ka5AYv9QPrVZJWHUs,10422
+dv_flow/mgr/task_runner.py,sha256=IBVcvIbZkWstbsqxU-l4z8J-IckVucvgsn1EKpi0-Ys,10704
 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=-0jfBihKTNLsHbILvul-quicUYFJ0yMcr5iZK4HFWrI,4096
+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_util.py,sha256=jdT48T_pZozCZUzkNy7tIhYL_kMGjWbV6g92oMYhRww,985
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
@@ -73,12 +73,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=ioXQ-IMZctzYysJM4RswuPWNSRxtPxzEcG5hutp3Cd4,1210
-dv_flow/mgr/util/util.py,sha256=BO7iqP_c9ttmXkojq7nKDN-g8wl1_Pco9k-KnrXxjwE,1889
+dv_flow/mgr/util/util.py,sha256=Ob2RTJOhanWajatiWJYm2ixuzspVx9hPFjGaaw0oPRI,1924
 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.9.15431140071rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.9.15431140071rc0.dist-info/METADATA,sha256=mDe1cofVKRPTFFQC1Elp2T0YrKoU6PLJ-qT9uHQg1Ec,13335
-dv_flow_mgr-1.9.15431140071rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dv_flow_mgr-1.9.15431140071rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.9.15431140071rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.9.15431140071rc0.dist-info/RECORD,,
+dv_flow_mgr-1.9.15511554180rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.9.15511554180rc0.dist-info/METADATA,sha256=zWcJ9HWQNZRq_dy0DnUACXD5FntncyF-0eUaa1XBpKc,13335
+dv_flow_mgr-1.9.15511554180rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dv_flow_mgr-1.9.15511554180rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.9.15511554180rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.9.15511554180rc0.dist-info/RECORD,,