dv-flow-mgr 0.0.2.14148165289a1__py3-none-any.whl → 0.0.2.14148897378a1__py3-none-any.whl

dv_flow/mgr/cmds/cmd_run.py

@@ -90,7 +90,7 @@ class CmdRun(object):
         for spec in args.tasks:
             if spec.find('.') == -1:
                 spec = pkg.name + "." + spec
-            task = builder.mkTaskGraph(spec)
+            task = builder.mkTaskGraph(spec, rundir=spec)
             tasks.append(task)
 
         asyncio.run(runner.run(tasks))

dv_flow/mgr/package_def.py

@@ -318,7 +318,6 @@ class PackageDef(BaseModel):
         needs = [] if task.needs is None else task.needs.copy()
 
         if base_ctor_t is not None:
-            print("-- uses")
             if passthrough is None:
                 passthrough = base_ctor_t.passthrough
             if consumes is None:

dv_flow/mgr/task_def.py

@@ -50,8 +50,9 @@ class PassthroughE(enum.Enum):
 
 
 class StrategyDef(BaseModel):
-    matrix : Dict[str,List[Any]] = dc.Field(
-        default_factory=dict,
+    chain: Union[bool, None] = dc.Field(default=None)
+    matrix : Union[Dict[str,List[Any]],None] = dc.Field(
+        default=None,
         description="Matrix of parameter values to explore")
 
 class TaskDef(BaseModel):

dv_flow/mgr/task_graph_builder.py

@@ -192,10 +192,6 @@ class TaskGraphBuilder(object):
         if task is None and name in self._task_m.keys():
             task = self._task_m[name]
         
-        # if task is None:
-        #     # TODO: Look for a def that hasn't yet been constructed
-        #     task = self._mkTaskGraph(name, self.rundir)
-
         return task
 
     def leave_compound(self, task : TaskNode):
@@ -203,11 +199,19 @@ class TaskGraphBuilder(object):
         if ctxt.rundir is None or ctxt.rundir == RundirE.Unique:
             self._rundir_s.pop()
 
-    def mkTaskGraph(self, task : str) -> TaskNode:
+    def mkTaskGraph(self, task : str, rundir=None) -> TaskNode:
         self._pkg_s.clear()
         self._task_m.clear()
 
-        return self._mkTaskGraph(task)
+        if rundir is not None:
+            self._rundir_s.append(rundir)
+
+        ret = self._mkTaskGraph(task)
+
+        if rundir is not None:
+            self._rundir_s.pop()
+
+        return ret
         
     def _mkTaskGraph(self, task : str) -> TaskNode:
 
@@ -241,7 +245,11 @@ class TaskGraphBuilder(object):
             need_fullname = self._resolveNeedRef(need_def)
             self._logger.debug("Searching for qualifed-name task %s" % need_fullname)
             if not need_fullname in self._task_m.keys():
+                # Go back to the root from a rundir perspective
+                rundir_s = self._rundir_s
+                self._rundir_s = [need_fullname]
                 need_t = self._mkTaskGraph(need_fullname)
+                self._rundir_s = rundir_s
                 self._task_m[need_fullname] = need_t
             needs.append(self._task_m[need_fullname])
 
@@ -357,7 +365,10 @@ class TaskGraphBuilder(object):
                 need_fullname = self._resolveNeedRef(need_def)
                 self._logger.debug("Searching for qualifed-name task %s" % need_fullname)
                 if not need_fullname in self._task_m.keys():
+                    rundir_s = self._rundir_s
+                    self._rundir_s = [need_fullname]
                     need_t = self._mkTaskGraph(need_fullname)
+                    self._rundir_s = rundir_s
                     self._task_m[need_fullname] = need_t
                 needs.append(self._task_m[need_fullname])
 

{dv_flow_mgr-0.0.2.14148165289a1.dist-info → dv_flow_mgr-0.0.2.14148897378a1.dist-info}/METADATA

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

@@ -7,7 +7,7 @@ dv_flow/mgr/fileset.py,sha256=4izm4-qldWLiZxWDUa5Em0iFizzS-S-O0YU6zvtbUUs,1264
 dv_flow/mgr/fragment_def.py,sha256=AHx3ITbiNbGCzlDk5FM8Iimm0GJnWXDDRAoRC1b41jM,1647
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=9FhOu1hKYKzlD88zehwrI6KAcs1E7TbXDnq4v54dqDQ,1701
-dv_flow/mgr/package_def.py,sha256=OfFIgKKYa0FWFEeAptJuCfwbOpGeTNRp9skax9lZhDY,20910
+dv_flow/mgr/package_def.py,sha256=iilJPa1zJoF5OkjdtBVro_fFImEbiJqPijFkYltut-o,20881
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=mkAw3DanIxcVWRYeh9lUAfUMkpqDFly_Ku_iobr4ix8,1745
@@ -15,8 +15,8 @@ dv_flow/mgr/param_ref_eval.py,sha256=5yH37oIX6f2qmk7GfRgNT5qZx0jm3CJFgB9lLDZZ1yQ
 dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
 dv_flow/mgr/pkg_rgy.py,sha256=d1nIjRm3ymMNJT-yiMDxCS6bFisTPvLMqh5VrfsHVKM,5404
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
-dv_flow/mgr/task_def.py,sha256=82dNRih_OTqq4gZNMtOmQ1DvzqqitKda6igpLVY82A8,3693
-dv_flow/mgr/task_graph_builder.py,sha256=wJDZGeuQfS3C5w-ovYE5O8casZ-Irp-TZlGYVb1G5kg,14959
+dv_flow/mgr/task_def.py,sha256=Yf9bkWqSETeFUSbddbpvl2Cu3pyssvhdz0X2jxabniA,3751
+dv_flow/mgr/task_graph_builder.py,sha256=Z14ySv1SFanFovR8HePwKglyFSzc6JsS8Z4RLmggM6c,15316
 dv_flow/mgr/task_graph_dot_writer.py,sha256=GxqiYwQJbFgUQdnPCS9vpIYmYFbSXwnXCSbGmjbxC3M,2418
 dv_flow/mgr/task_listener_log.py,sha256=hrJEjSRXXoovDTcD1Cmhi3Spzw7uEJ-WP6tv6JUaa6s,4060
 dv_flow/mgr/task_node.py,sha256=7lZKsTbOS0Cuhe-TyPj9Gcuh1a4k3sliRXW81R4UGCg,4851
@@ -35,7 +35,7 @@ dv_flow/mgr/task_runner.py,sha256=-919VntXAe2XSuFW2dFpgvUre-NkILBnDBbAKBZYn5w,95
 dv_flow/mgr/type.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/type_def.py,sha256=NDeyplKrPnWwEv4yHkhXEMK9d9j39b5MOeLB-1Mchqo,1095
 dv_flow/mgr/cmds/cmd_graph.py,sha256=Ykw__EdwamDBZZKxQZVbtMtFl7koq5dJMShTBXSM2pk,2672
-dv_flow/mgr/cmds/cmd_run.py,sha256=VL0LU0zYnClQ8Id30sxMN_fHJzQFJsOuj7qDG7GTT60,3198
+dv_flow/mgr/cmds/cmd_run.py,sha256=f0zt2OxGZC50aaDR7wGDH8YBk3rMQoBl8YeRHWcJUD0,3211
 dv_flow/mgr/cmds/cmd_show.py,sha256=CZlgwB3Hcu-6HS-diqnWjCcPPpO-kjIIXU3DgWXvsf4,3773
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/create_file.py,sha256=TAUhpXlTmUDUYw4Dw0cI9FPuYI84yCVkoadnWZxi_8U,2888
@@ -49,9 +49,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=yg9oTPRiO87mkCSOQpOtlG9vyKPQzY3qp4OJkEMbWyY,1443
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=lrEI-Jwb8j4I4yYOn9hq7_7NYbK8leVxLesrHyEWm-E,1879
-dv_flow_mgr-0.0.2.14148165289a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.2.14148165289a1.dist-info/METADATA,sha256=Yw1ZOx3YbC_sT77QcD_2e5-zitdJPFBGFAMqThGvHVQ,13336
-dv_flow_mgr-0.0.2.14148165289a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-0.0.2.14148165289a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.2.14148165289a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.2.14148165289a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.2.14148897378a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.2.14148897378a1.dist-info/METADATA,sha256=h-oh4eGN5VaFwSkVl4wfntxgac783_x42eGairZBoso,13336
+dv_flow_mgr-0.0.2.14148897378a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-0.0.2.14148897378a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.2.14148897378a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.2.14148897378a1.dist-info/RECORD,,