dv-flow-mgr 1.10.15800610556rc0__py3-none-any.whl → 1.10.16182118062rc0__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="15800610556rc0"
+SUFFIX="16182118062rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/ext_rgy.py

@@ -31,8 +31,9 @@ from .shell_callable import ShellCallable
 @dc.dataclass
 class ExtRgy(object):
     _inst : ClassVar = None
+    _log : logging.Logger = None
 
-    def __init__(self):
+    def __post_init__(self):
         self._pkgpath = []
         self._pkg_m : Dict[str, str] = {}
         self._shell_m : Dict[str, Callable] = {}
@@ -59,7 +60,8 @@ class ExtRgy(object):
         
     def findPackagePath(self, name) -> str:
         ret = None
-        self._log.debug("--> findPackagePath(%s)" % name)
+        self._log.debug("--> findPackagePath(%s) (%s)" % (
+            name, ",".join(self._pkg_m.keys())))
         if name in self._pkg_m.keys():
             ret = self._pkg_m[name]
         else:
@@ -147,6 +149,8 @@ class ExtRgy(object):
             except Exception as e:
                 self._log.critical("Error loading plugin %s: %s" % (p.name, str(e)))
                 raise e
+            
+        self._log.debug("Registered packages: %s" % str(",".join(self._pkg_m.keys())))
 
         # self._pkgs = {}
         # for pkg in self._load_pkg_list():

dv_flow/mgr/std/flow.dv

@@ -85,6 +85,16 @@ package:
       incdir: 
         type: bool
         value: false
+  - name: SetFileType
+    consumes:
+    - type: std.FileSet 
+    desc: Outputs all input filesets with the specified filetype
+    shell: pytask
+    run: dv_flow.mgr.std.set_file_type.SetFileType
+    with:
+      filetype:
+        type: str
+        value: ""
   - name: IncDirs
     shell: pytask
     run: dv_flow.mgr.std.incdirs.IncDirs

dv_flow/mgr/std/set_file_type.py

@@ -0,0 +1,18 @@
+from dv_flow.mgr import TaskDataResult, TaskDataInput, TaskRunCtxt
+
+async def SetFileType(ctxt: TaskRunCtxt, inputs: TaskDataInput) -> TaskDataResult:
+    output = []
+
+    for inp in inputs.inputs:
+        if inp.type == "std.FileSet":
+            inp = inp.copy()
+            inp.filetype = inputs.params.filetype
+            inp.src = None
+            inp.seq = -1
+            output.append(inp)
+
+    return TaskDataResult(
+        changed=inputs.changed,
+        output=output,
+        status=0
+    )

dv_flow/mgr/task_graph_builder.py

@@ -387,12 +387,16 @@ class TaskGraphBuilder(object):
         self._log.debug("<-- mkTaskNode: %s" % task_t)
         return ret
     
-    def mkDataItem(self, name, **kwargs):
-        self._log.debug("--> mkDataItem: %s" % name)
+    def mkDataItem(self, type, name=None, **kwargs):
+        self._log.debug("--> mkDataItem: %s" % type)
 
-        if name in self._type_m.keys():
-            tt = self._type_m[name]
-        else:
+        tt = None
+        if type in self._type_m.keys():
+            tt = self._type_m[type]
+        elif self.loader is not None:
+            tt = self.loader.getType(type)
+
+        if type is None:
             raise Exception("Type %s does not exist" % name)
         
         if tt in self._type_node_m.keys():

dv_flow/mgr/task_node_leaf.py

@@ -193,6 +193,10 @@ class TaskNodeLeaf(TaskNode):
                                     getattr(out, "type", "<unknown>"),
                                     getattr(out, "src", "<unknown>")))
                                 output.append(out)
+                            else:
+                                self._log.debug("Skipping consumed type %s from %s" % (
+                                    getattr(out, "type", "<unknown>"),
+                                    getattr(out, "src", "<unknown>")))
         else:
             self._log.debug("non-passthrough: %s (only local outputs propagated) %s" % (
                 self.name,
@@ -204,9 +208,11 @@ class TaskNodeLeaf(TaskNode):
 
         # Add our own output
         local_out = self.result.output.copy()
+        self._log.debug("local_out of %s: %d" % (self.name, len(local_out)))
         for i,out in enumerate(local_out):
             out.src = self.name
             out.seq = i
+            self._log.debug("Adding output of type %s" % out.type)
             output.append(out)
 
         self._log.debug("output dep_m: %s %s" % (self.name, str(dep_m)))

{dv_flow_mgr-1.10.15800610556rc0.dist-info → dv_flow_mgr-1.10.16182118062rc0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=LGGJpMvy-J0jDtmr9Z0j6cuf95OmqkvCKu74e9qYGrA,1316
+dv_flow/mgr/__init__.py,sha256=cGNkXSa1_LU5zrptHtVEQizezCMWT-MjTcP07g_jgp8,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
@@ -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=BBaxSqOvSZcrE8BjG6cY5skCucOmY0j9rADHL55EITM,6119
+dv_flow/mgr/ext_rgy.py,sha256=rf8lDXGbISBu4S7WuwX36b-sOiZ22d5dtjPAu2anogo,6307
 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
@@ -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=0lO837SY6Bhw2GE6iwNNQj2sbPTcIZhXr1-TwJBpd7A,33599
+dv_flow/mgr/task_graph_builder.py,sha256=16f33f9-mWN85aGH_t9cjPLL7AoMsSiGSRUxB3leDeg,33721
 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
@@ -50,7 +50,7 @@ dv_flow/mgr/task_node_ctor_proxy.py,sha256=ViOFJ64JM4-CGFZNl89BghFuKSQ66kZVqSj4v
 dv_flow/mgr/task_node_ctor_task.py,sha256=d49g90TyPCMFR8BuWWqp4ym-MW5vGSdDR0V47Ru28JY,2232
 dv_flow/mgr/task_node_ctor_wrapper.py,sha256=KMSYd4ik2Si7UXhNMeXAPHBwwrFkuhpeTMeYRpWv0hw,3718
 dv_flow/mgr/task_node_ctxt.py,sha256=KHt_kQch6LDq70Oor7z2xbepiiaK2jyp4S-KWZGsRjo,205
-dv_flow/mgr/task_node_leaf.py,sha256=nULlu-veyPC-PXdoQhahkLgqpdKNzaoD0XUlCw0EuZ4,9109
+dv_flow/mgr/task_node_leaf.py,sha256=98nVAFGuv5ZJPoc1CNUEeOc-aV69xV8Wd1hEP9QLw3Y,9517
 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
@@ -68,18 +68,19 @@ dv_flow/mgr/std/create_file.py,sha256=SEpKTQdiY32002C7b4kYfAiK9v_xajixOJU5WftW75
 dv_flow/mgr/std/data_item.py,sha256=olKtspEVFOvr92reUl4QaQV27UVyjSGIfIWpsy0Myvo,434
 dv_flow/mgr/std/exec.py,sha256=UChqa_tAjvdB1NjqTsvlPgFomP8hMsX2rAOPyUonNpk,3896
 dv_flow/mgr/std/fileset.py,sha256=_9IUjZ2_doygc29Qg1hJPaFPzlaIaTdvHnYTai8mE3A,4183
-dv_flow/mgr/std/flow.dv,sha256=qT3qlDjo6DMMcPXHLbW6Z0OJOouXupQK3cm_15JxSKI,3786
+dv_flow/mgr/std/flow.dv,sha256=iTVpI98PBbn3oUYyQJ6yb-S7zVReM0ZL2WmodH-hZzs,4043
 dv_flow/mgr/std/incdirs.py,sha256=F0wraOxkRJRkrhsyk9v2YvpquFtcK4ZsMO1G9sgmhmA,588
 dv_flow/mgr/std/message.py,sha256=0JHLErg8whqMLAasG1fumZ2O7R7WNWeNQ9ibJaLDpVY,1029
+dv_flow/mgr/std/set_file_type.py,sha256=t7NtTmWW3xVckoiHn3hhL2LGAPihP07n_94_4kc8_vw,504
 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=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.15800610556rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.10.15800610556rc0.dist-info/METADATA,sha256=vU3peUbzmqG72Uinfu8eQvqd2zD45i4lEPnBETGds6I,13336
-dv_flow_mgr-1.10.15800610556rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dv_flow_mgr-1.10.15800610556rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.10.15800610556rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.10.15800610556rc0.dist-info/RECORD,,
+dv_flow_mgr-1.10.16182118062rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.10.16182118062rc0.dist-info/METADATA,sha256=wp5daCve0Kgk8dmR3SgmwDRnZoj1HCeteoCP3abREJE,13336
+dv_flow_mgr-1.10.16182118062rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dv_flow_mgr-1.10.16182118062rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.10.16182118062rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.10.16182118062rc0.dist-info/RECORD,,