dv-flow-mgr 1.8.14931268525rc0__py3-none-any.whl → 1.8.14950048134rc0__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.8.0"
-SUFFIX="14931268525rc0"
+SUFFIX="14950048134rc0"
 __version__="%s%s" % (VERSION, SUFFIX)
 

dv_flow/mgr/cmds/cmd_run.py

@@ -22,6 +22,7 @@
 import asyncio
 import os
 import logging
+import sys
 from typing import ClassVar
 from ..util import loadProjPkgDef
 from ..task_data import SeverityE
@@ -48,7 +49,7 @@ class CmdRun(object):
 
         if listener.has_severity[SeverityE.Error] > 0:
             print("Error(s) encountered while loading package definition")
-            return 1
+            sys.exit(1)
 
         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/package_loader.py

@@ -448,25 +448,27 @@ class PackageLoader(object):
             imp_path = os.path.join(base, leaf)
             self._log.debug("Found: %s" % imp_path)
         elif os.path.isdir(os.path.join(base, leaf)):
-            path = os.path.join(base, leaf)
-
-            while path is not None and os.path.isdir(path) and not os.path.isfile(os.path.join(path, "flow.dv")):
-                # Look one directory down
-                next_dir = None
-                for dir in os.listdir(path):
-                    if os.path.isdir(os.path.join(path, dir)):
-                        if next_dir is None:
-                            next_dir = dir
-                        else:
-                            path = None
-                            break
-                if path is not None:
-                    path = next_dir
-            if path is not None and os.path.isfile(os.path.join(path, "flow.dv")):
-                imp_path = os.path.join(path, "flow.dv")
-                self._log.debug("Found: %s" % imp_path)
+            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))
         self._log.debug("<-- _findFlowDvInDir %s" % imp_path)
         return imp_path
+    
+    def _findFlowDvSubdir(self, dir):
+        ret = None
+        # 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))
+            if ret is not None:
+                break
+        return ret
 
     def _loadFragments(self, pkg, fragments, basedir, taskdefs, typedefs):
         for spec in fragments:
@@ -548,6 +550,10 @@ class PackageLoader(object):
     def getTask(self, name) -> Task:
         task = self._findTask(name)
         return task
+    
+    def getType(self, name) -> Type:
+        type = self._findType(name)
+        return type
 
     def _loadTasks(self, pkg, taskdefs : List[TaskDef], basedir : str):
         self._log.debug("--> _loadTasks %s" % pkg.name)
@@ -747,10 +753,12 @@ class PackageLoader(object):
             return self._loader_scope.findType(name)
 
     def _findTask(self, name):
+        ret = None
         if len(self._pkg_s):
-            return self._pkg_s[-1].findTask(name)
+            ret = self._pkg_s[-1].findTask(name)
         else:
-            return self._loader_scope.findTask(name)
+            ret = self._loader_scope.findTask(name)
+        return ret
         
     def _findTaskOrType(self, name):
         self._log.debug("--> _findTaskOrType %s" % name)

dv_flow/mgr/std/flow.dv

@@ -120,22 +120,12 @@ package:
           Optional timestamp file to determine if running 
           the command changed the output
 
-  - name: DataItem
-    shell: pytask
-    run: dv_flow.mgr.std.data_item.DataItem
-    doc: |
-      Creates and outputs a data item
-    with:
-      type:
-        type: str
-        value: ""
-      with:
-        type: map
   types:
   - name: DataItem
     with:
       type:
         type: str
+
   - name: FileSet
     uses: std.DataItem
     with:

dv_flow/mgr/task_graph_builder.py

@@ -306,41 +306,76 @@ class TaskGraphBuilder(object):
 
     def mkTaskNode(self, task_t, name=None, srcdir=None, needs=None, **kwargs):
         self._log.debug("--> mkTaskNode: %s" % task_t)
+        ret = None
 
+        task = None
         if task_t in self._task_m.keys():
             task = self._task_m[task_t]
-            # Get the package for this task
-            self.push_name_resolution_context(task.package)
         elif self.loader is not None:
             task = self.loader.getTask(task_t)
+
             if task is None:
-                raise Exception("task_t (%s) not present" % str(task_t))
-            self.push_name_resolution_context(task.package)
-        else:
-            raise Exception("task_t (%s) not present" % str(task_t))
+                if task_t in self._type_m.keys():
+                    type = self._type_m[task_t]
+                
+                if type is None:
+                    type = self.loader.getType(task_t)
+                
+                if type is not None:
+                    if srcdir is None:
+                        srcdir = os.path.dirname(type.srcinfo.file)
+                    ret = TaskNodeLeaf(
+                        name=name,
+                        srcdir=srcdir,
+                        params=type.paramT(),
+                        ctxt=self._ctxt,
+                        task=DataCallable(type.paramT))
+                    self._task_node_m[name] = ret
+                else:
+                    raise Exception("task_t (%s) is neither a task nor type" % str(task_t))
 
-        try:
-            ret = self._mkTaskNode(
-                task, 
-                name=name, 
+        elif task_t in self._type_m.keys():
+            # Create a task around the type
+            type = self._type_m[task_t]
+            if srcdir is None:
+                srcdir = os.path.dirname(type.srcinfo.file)
+            ret = TaskNodeLeaf(
+                name=name,
                 srcdir=srcdir,
-                eval=self._eval)
+                params=type.paramT(),
+                ctxt=self._ctxt,
+                task=DataCallable(type.paramT)
+            )
+            self._task_node_m[name] = ret
 
-            if needs is not None:
-                for need in needs:
-                    ret.needs.append((need, False))
+        if ret is None:
+            if task is None:
+                raise Exception("task_t (%s) not present" % str(task_t))
 
-            for k,v in kwargs.items():
-                if hasattr(ret.params, k):
-                    setattr(ret.params, k, v)
-                else:
-                    raise Exception("Task %s parameters do not include %s" % (task.name, k))
+            self.push_name_resolution_context(task.package)
 
-            self._log.debug("<-- mkTaskNode: %s (%d needs)" % (task_t, len(ret.needs)))
-            return ret
-        finally:
-            # Clean up package context if we created one
-            self.pop_name_resolution_context()
+            try:
+                ret = self._mkTaskNode(
+                    task, 
+                    name=name, 
+                    srcdir=srcdir,
+                    eval=self._eval)
+
+                if needs is not None:
+                    for need in needs:
+                        ret.needs.append((need, False))
+
+                for k,v in kwargs.items():
+                    if hasattr(ret.params, k):
+                        setattr(ret.params, k, v)
+                    else:
+                        raise Exception("Task %s parameters do not include %s" % (task.name, k))
+            finally:
+                # Clean up package context if we created one
+                self.pop_name_resolution_context()
+
+        self._log.debug("<-- mkTaskNode: %s" % task_t)
+        return ret
     
     def mkDataItem(self, name, **kwargs):
         self._log.debug("--> mkDataItem: %s" % name)

{dv_flow_mgr-1.8.14931268525rc0.dist-info → dv_flow_mgr-1.8.14950048134rc0.dist-info}/METADATA

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

@@ -1,4 +1,4 @@
-dv_flow/mgr/__init__.py,sha256=oKr6XoYlfmr7HcnXVV6xho2mkUJB4ROiJB-2tfirtYA,1315
+dv_flow/mgr/__init__.py,sha256=RAohHzmrdRRIKaqwH7AMnO2sTmlt1FtW-4kx-j9KvOw,1315
 dv_flow/mgr/__main__.py,sha256=BogNdBkXhgg05E8_IumNkVoag6WwvfbpiI8346oOtPo,3844
 dv_flow/mgr/cond_def.py,sha256=2ZkzPusqVkN1fFMTvkDl9O_OJLPdD_cK3xzX9J75RMw,343
 dv_flow/mgr/config.py,sha256=b2MVlVVNB0psk8x4bQRAYshkpNJrtyMtV1Ymhmx9AfM,137
@@ -20,7 +20,7 @@ dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=L1ba5xguOZWuyg9s4MfafKgSoIka3SgAQzYAmcV7XgQ,4430
 dv_flow/mgr/package_def.py,sha256=1O1SBJATnw-zeYKRNENgw-RWxZK0hxNQhnncfE_NR-U,5674
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
-dv_flow/mgr/package_loader.py,sha256=sAl4tg4-etXffzoE51ruMoRm3wf8eRMuhMtnEjWfTRs,33563
+dv_flow/mgr/package_loader.py,sha256=7kI7UFALnnOhz128iiH_Fid9vfNSYAIzhMeQPuA4DJg,33704
 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
@@ -34,7 +34,7 @@ dv_flow/mgr/srcinfo.py,sha256=xrfp-relVr7hYNbxOjY5jqX4H0nNMm9HK5AAM6_Piyk,366
 dv_flow/mgr/task.py,sha256=n3v9A9HvgMWNeQhXVB_L2qRjgjounXMs9-bbxtyEau8,2088
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
 dv_flow/mgr/task_def.py,sha256=8NPwtTROfWDkMqcO9mKXV4dw0sC4mCMmnsNuv8uTdTY,5094
-dv_flow/mgr/task_graph_builder.py,sha256=q7BS7OLYkS6uZwQLvo6P_CtJkhIvPal_tXLZHgUuLpU,28172
+dv_flow/mgr/task_graph_builder.py,sha256=2u5iOa4vMZaAxbImVknMLQLV6TEVbxXzEfsE7d3YXKI,29380
 dv_flow/mgr/task_graph_dot_writer.py,sha256=qK4Imy9o2_F1aKoU1tJ-qoBHslq2BhSMbdjAUPfpN7I,6009
 dv_flow/mgr/task_listener_log.py,sha256=Ai-6X5BOoGsaNTgnlXEW0-czrjJm7__ShNK501CUmko,4337
 dv_flow/mgr/task_listener_trace.py,sha256=7B-V2YK8uXd_QSGBq_7USmbe5CleVvwumU0CpsmxZvg,6224
@@ -57,14 +57,14 @@ 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=yg5KbNrGvm3dySiI0Qei_pMWZkOE9GtEyaQ4IdNVmoE,2852
-dv_flow/mgr/cmds/cmd_run.py,sha256=SsCZXwutJW1XT5iXtJqvdeg6p6HEa86V5hELNKuaWgA,4082
+dv_flow/mgr/cmds/cmd_run.py,sha256=-0jfBihKTNLsHbILvul-quicUYFJ0yMcr5iZK4HFWrI,4096
 dv_flow/mgr/cmds/cmd_show.py,sha256=JOIFaVXt8YCf9bKXfq6qzV5wQdxdLHqE-yCj0ecGREs,3755
 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
 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=vizP3u3yU5iyCmsAeVFeIKy2Ikvhol-_NjCYWOcJCOE,4003
+dv_flow/mgr/std/flow.dv,sha256=qT3qlDjo6DMMcPXHLbW6Z0OJOouXupQK3cm_15JxSKI,3786
 dv_flow/mgr/std/incdirs.py,sha256=F0wraOxkRJRkrhsyk9v2YvpquFtcK4ZsMO1G9sgmhmA,588
 dv_flow/mgr/std/message.py,sha256=0JHLErg8whqMLAasG1fumZ2O7R7WNWeNQ9ibJaLDpVY,1029
 dv_flow/mgr/std/task_null.py,sha256=dw6LXBXVwth6gLPeduDvlz5znAhcVpDH8r1DticD-0w,1041
@@ -74,9 +74,9 @@ dv_flow/mgr/util/util.py,sha256=BO7iqP_c9ttmXkojq7nKDN-g8wl1_Pco9k-KnrXxjwE,1889
 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/util/cmds/cmd_workspace.py,sha256=egmaIXpe5L-TePwmcfisfrG6tdiTUWSjqa9Za5WChVs,890
-dv_flow_mgr-1.8.14931268525rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-1.8.14931268525rc0.dist-info/METADATA,sha256=xtNJAHBujbtKSu7qN8OAoN_tAMUOtvUFzmd9eFKAwRU,13335
-dv_flow_mgr-1.8.14931268525rc0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-dv_flow_mgr-1.8.14931268525rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-1.8.14931268525rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-1.8.14931268525rc0.dist-info/RECORD,,
+dv_flow_mgr-1.8.14950048134rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-1.8.14950048134rc0.dist-info/METADATA,sha256=zkhMnyZn6nXcEc_vPWK_jlt-k8gQzG4g3BaDYm6Oca8,13335
+dv_flow_mgr-1.8.14950048134rc0.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+dv_flow_mgr-1.8.14950048134rc0.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-1.8.14950048134rc0.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-1.8.14950048134rc0.dist-info/RECORD,,

{dv_flow_mgr-1.8.14931268525rc0.dist-info → dv_flow_mgr-1.8.14950048134rc0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any