dv-flow-mgr 0.0.1.12971126211a1__py3-none-any.whl → 0.0.1.12992722023a1__py3-none-any.whl

dv_flow/mgr/package_def.py

@@ -119,6 +119,7 @@ class PackageDef(BaseModel):
         return ctor_t
 
     def handleParams(self, task, ctor_t):
+        self._log.debug("--> handleParams %s params=%s" % (task.name, str(task.params)))
 
         if task.params is not None and len(task.params) > 0:
             decl_params = False
@@ -131,18 +132,21 @@ class PackageDef(BaseModel):
 #            ctor_t.params.update(task.params)
 
             for value in task.params.values():
-                if "type" in value:
+                self._log.debug("value: %s" % str(value))
+                if type(value) == dict and "type" in value.keys():
                     decl_params = True
                     break
 
+            field_m = {}
+            # First, add parameters from the base class
+            base_o = ctor_t.mkParams()
+            for fname,info in base_o.model_fields.items():
+                self._log.debug("Field: %s (%s)" % (fname, info.default))
+                field_m[fname] = (info.annotation, info.default)
+
             if decl_params:
+                self._log.debug("Type declares new parameters")
                 # We need to combine base parameters with new parameters
-                field_m = {}
-                # First, add parameters from the base class
-                base_o = ctor_t.mkParams()
-                for fname,info in base_o.model_fields.items():
-                    self._log.debug("Field: %s (%s)" % (fname, info.default))
-                    field_m[fname] = (info.annotation, info.default)
                 ptype_m = {
                     "str" : str,
                     "int" : int,
@@ -159,6 +163,7 @@ class PackageDef(BaseModel):
                 }
                 for p in task.params.keys():
                     param = task.params[p]
+                    self._log.debug("param: %s" % str(param))
                     if type(param) == dict and "type" in param.keys():
                         ptype_s = param["type"]
                         if ptype_s not in ptype_m.keys():
@@ -190,6 +195,7 @@ class PackageDef(BaseModel):
                     uses=ctor_t,
                     params_ctor=param_t)
             else: # no new parameters declared
+                self._log.debug("Type only overrides existing parameters")
                 for p in task.params.keys():
                     param = task.params[p]
                     if p not in field_m.keys():
@@ -202,12 +208,15 @@ class PackageDef(BaseModel):
                         raise Exception("No value specified for param %s: %s" % (
                             p, str(param)))
                     field_m[p] = (field_m[p][0], value)
-                ctor_t.params[p] = value
+                    self._log.debug("Set param=%s to %s" % (p, str(value)))
+                    ctor_t.params[p] = value
+
+        self._log.debug("<-- handleParams %s" % task.name)
 
         return ctor_t
 
     def mkTaskCtor(self, session, task, srcdir, tasks_m) -> TaskCtor:
-        self._log.debug("--> %s::mkTaskCtor %s" % (self.name, task.name))
+        self._log.debug("--> %s::mkTaskCtor %s (srcdir: %s)" % (self.name, task.name, srcdir))
         ctor_t : TaskCtor = None
 
         # Determine the implementation constructor first
@@ -260,6 +269,7 @@ class PackageDef(BaseModel):
                 srcdir=srcdir)
 
         ctor_t = self.handleParams(task, ctor_t)
+        ctor_t.depends.extend(task.depends)
 
         self._log.debug("<-- %s::mkTaskCtor %s" % (self.name, task.name))
         return ctor_t

dv_flow/mgr/std/fileset.py

@@ -26,6 +26,9 @@ class FileSet(Task):
         ex_memento = self.getMemento(TaskFileSetMemento)
         memento = TaskFileSetMemento()
 
+        self._log.debug("ex_memento: %s" % str(ex_memento))
+        self._log.debug("params: %s" % str(self.params))
+
         if self.params is not None:
             glob_root = os.path.join(self.srcdir, self.params.base)
             glob_root = glob_root.strip()
@@ -33,6 +36,8 @@ class FileSet(Task):
             if glob_root[-1] == '/' or glob_root == '\\':
                 glob_root = glob_root[:-1]
 
+            self._log.debug("glob_root: %s" % glob_root)
+
             fs = _FileSet(
                 src=self.name, 
                 type=self.params.type,
@@ -45,6 +50,8 @@ class FileSet(Task):
             for pattern in self.params.include:
                 included_files.extend(glob.glob(os.path.join(glob_root, pattern), recursive=False))
 
+            self._log.debug("included_files: %s" % str(included_files))
+
             for file in included_files:
                 if not any(glob.fnmatch.fnmatch(file, os.path.join(glob_root, pattern)) for pattern in self.params.exclude):
                     memento.files.append((file, os.path.getmtime(os.path.join(glob_root, file))))

dv_flow/mgr/task.py

@@ -123,7 +123,7 @@ class TaskCtorCls(TaskCtor):
     _log : ClassVar = logging.getLogger("TaskCtorCls")
 
     def mkTask(self, name : str, depends, rundir, srcdir=None, params=None):
-        self._log.debug("--> %s::mkTask (%s)" % (self.name, str(self.task_ctor)))
+        self._log.debug("--> %s::mkTask (%s) srcdir=%s" % (self.name, str(self.task_ctor), srcdir))
 
         if srcdir is None:
             srcdir = self.srcdir
@@ -137,7 +137,6 @@ class TaskCtorCls(TaskCtor):
             rundir=rundir, 
             srcdir=srcdir, 
             params=params)
-        ret.srcdir = self.srcdir
 
         # Update parameters on the way back
         self.applyParams(ret.params)

{dv_flow_mgr-0.0.1.12971126211a1.dist-info → dv_flow_mgr-0.0.1.12992722023a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12971126211a1
+Version: 0.0.1.12992722023a1
 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.1.12971126211a1.dist-info → dv_flow_mgr-0.0.1.12992722023a1.dist-info}/RECORD

@@ -3,10 +3,10 @@ dv_flow/mgr/__main__.py,sha256=uik6gDAvtZNG0yyDKYc4FTl6R1QHAR543jNG2lCAa6E,1771
 dv_flow/mgr/fileset.py,sha256=FNvC5sU2ArxJ0OO3v8dXTv8zX-bZ5t0a0ljne0fQQ1o,1150
 dv_flow/mgr/fragment_def.py,sha256=p5i6ONtBWlDHTBFsduu3Z36_76Bn8PCIylp_xoZ7jfQ,1552
 dv_flow/mgr/package.py,sha256=AOLEEotVQF9VNMMl13uNQ7Na2TuHPXxEvybBOX7XIps,1615
-dv_flow/mgr/package_def.py,sha256=lokG420kcEPDNu11GYQSbCalX7gxeDoTJy8iMc1GmXM,13451
+dv_flow/mgr/package_def.py,sha256=iHBFV-CKyCypvrd31zm3Yjkcib9xZo1gFlFL7YMfJO8,14012
 dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
 dv_flow/mgr/pkg_rgy.py,sha256=2R_EaeBDJn5qUq9DzSnLc37wUP36MWSv-p0LgUjJRAg,4471
-dv_flow/mgr/task.py,sha256=7Nc7H2Wj9xWAHjspJ5TKw6DZ7g8DMisAqWuhjcy3MZU,9102
+dv_flow/mgr/task.py,sha256=giy5elwIS_fab6wGnA8JCeZIEeX0nG5zpcq5ifGYSOs,9087
 dv_flow/mgr/task_data.py,sha256=XBPWwvuaQ3BZ94wknvv1bqLh98iTzAg5fskv7_kk6DQ,10524
 dv_flow/mgr/task_def.py,sha256=96hSwqJo0MazJ1VcLhovYRmNCplsNLt47AumtyjSddU,1690
 dv_flow/mgr/task_graph_builder.py,sha256=4dfy_T26MYI7ls2xiofr4V0ItZHDehU2iw6UBPt-SZQ,7074
@@ -16,13 +16,13 @@ dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1
 dv_flow/mgr/util.py,sha256=06eVyURF4ga-s8C9Sd3ZSDebwO4QS0XXaB8xADVbWRc,1437
 dv_flow/mgr/cmds/cmd_run.py,sha256=eths8kT7mBmpZqwOuMtpKAaux4rg-f7hPBxxTHbpKT4,2903
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
-dv_flow/mgr/std/fileset.py,sha256=Hn3_C1CczSRSaNYI3aDYbaaNdnKDlIqU16_GRIBP4PI,2461
+dv_flow/mgr/std/fileset.py,sha256=uP7bGntRq-Tn5_GEFnt0_J_OAmfvep3GlCwCuE8by4o,2710
 dv_flow/mgr/std/flow.dv,sha256=pSpzrPPEu_L8DHccGfArxsKYgUfyQidShZc0ShgGtsY,500
 dv_flow/mgr/std/message.py,sha256=BPTHnEMD4tBufQ9LvsS9Sa_0xjaJATbBpwqosWslvVA,193
 dv_flow/mgr/std/task_null.py,sha256=KObmjG_4D08GJ1k6neqKIQrFY72Sj0jLnwXxEkq5HA0,321
-dv_flow_mgr-0.0.1.12971126211a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.12971126211a1.dist-info/METADATA,sha256=vFSzc2a0PhhsjazyaZhTv7BES6zdQ7V4bFD-6XkrUmc,13276
-dv_flow_mgr-0.0.1.12971126211a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-dv_flow_mgr-0.0.1.12971126211a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.12971126211a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.12971126211a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.12992722023a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.12992722023a1.dist-info/METADATA,sha256=kCTd3eqAjQmtiL2_rnfPvCERKOp4I3aRl3yusyz4xMw,13276
+dv_flow_mgr-0.0.1.12992722023a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+dv_flow_mgr-0.0.1.12992722023a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.12992722023a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.12992722023a1.dist-info/RECORD,,