dv-flow-mgr 0.0.1.13867752514a1__tar.gz → 0.0.1.13931887892a1__tar.gz

{dv_flow_mgr-0.0.1.13867752514a1 → dv_flow_mgr-0.0.1.13931887892a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13867752514a1
+Version: 0.0.1.13931887892a1
 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.13867752514a1 → dv_flow_mgr-0.0.1.13931887892a1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "0.0.1.13867752514a1"
+version = "0.0.1.13931887892a1"
 dependencies = [
     'jq',
     'pydantic',

{dv_flow_mgr-0.0.1.13867752514a1 → dv_flow_mgr-0.0.1.13931887892a1}/src/dv_flow/mgr/pkg_rgy.py

@@ -120,10 +120,11 @@ class PkgRgy(object):
                     
                     for name,path in pkg_m.items():
                         self._log.debug("Registering package %s: %s" % (name, path))
-                        if name in self._pkg_m.keys():
-                            raise Exception("Package %s already registered using path %s. Conflicting path: %s" % (
+                        if name in self._pkg_m.keys() and self._pkg_m[name][0] != path:
+                            self._log.debug("Package %s already registered using path %s. Conflicting path: %s" % (
                                 name, self._pkg_m[name][0], path))
-                        self._pkg_m[name] = (path, None)
+                        else:
+                            self._pkg_m[name] = (path, None)
             except Exception as e:
                 self._log.critical("Error loading plugin %s: %s" % (p.name, str(e)))
                 raise e

{dv_flow_mgr-0.0.1.13867752514a1 → dv_flow_mgr-0.0.1.13931887892a1}/src/dv_flow/mgr/std/exec.py

@@ -25,6 +25,8 @@ from dv_flow.mgr import TaskDataResult
 
 _log = logging.getLogger("Exec")
 
+class Memento()
+
 async def Exec(runner, input) -> TaskDataResult:
     _log.debug("TaskExec run: %s: cmd=%s" % (input.name, input.params.command))
 

{dv_flow_mgr-0.0.1.13867752514a1 → dv_flow_mgr-0.0.1.13931887892a1}/src/dv_flow/mgr/std/flow.dv

@@ -47,10 +47,31 @@ package:
         type: str
   - name: Exec
     pytask: dv_flow.mgr.std.exec.Exec
-    with: 
+    desc: Executes a subprocess
+    with:
+      shell:
+        type: str
+        value: "bash"
+        doc: |
+          Shell to use for executing the command
       command:
         type: str
         value: ""
+        doc: |
+          Command to execute
+      when:
+        type: str
+        value: "always"
+        doc: |
+          Specifies when the command is run.
+          - always  -- Command is always run (default)
+          - changed -- If upstream tasks change
+      timestamp:
+        type: str
+        value: ""
+        doc: |
+          Optional timestamp file to determine if running 
+          the command changed the output
   types:
   # - name: TaskDataItem
   #   doc: |

{dv_flow_mgr-0.0.1.13867752514a1 → dv_flow_mgr-0.0.1.13931887892a1}/src/dv_flow/mgr/task_def.py

@@ -48,6 +48,7 @@ class TaskDef(BaseModel):
     params: Dict[str,Union[str,list,ParamDef]] = dc.Field(default_factory=dict, alias="with")
     passthrough: bool = dc.Field(default=False)
     consumes : List[Any] = dc.Field(default_factory=list)
+    tasks: List['TaskDef'] = dc.Field(default_factory=list)
 
 #    out: List[TaskOutput] = dc.Field(default_factory=list)
 

{dv_flow_mgr-0.0.1.13867752514a1 → dv_flow_mgr-0.0.1.13931887892a1}/src/dv_flow/mgr/task_node.py

@@ -19,6 +19,7 @@
 #*     Author: 
 #*
 #****************************************************************************
+import enum
 import os
 import sys
 import dataclasses as dc
@@ -31,6 +32,10 @@ from .task_params_ctor import TaskParamsCtor
 from .param_ref_eval import ParamRefEval
 from .param import Param
 
+class RundirE(enum.Enum):
+    Unique = enum.auto()
+    Inherit = enum.auto()
+
 @dc.dataclass
 class TaskNode(object):
     """Executable view of a task"""
@@ -48,6 +53,7 @@ class TaskNode(object):
     consumes : List[Any] = dc.field(default_factory=list)
     needs : List[Tuple['TaskNode',bool]] = dc.field(default_factory=list)
     rundir : str = dc.field(default=None)
+    rundir_t : RundirE = dc.field(default=RundirE.Unique)
     output : TaskDataOutput = dc.field(default=None)
     result : TaskDataResult = dc.field(default=None)
     start : float = dc.field(default=None)
@@ -118,6 +124,12 @@ class TaskNode(object):
 
         self._log.debug("in_params[2]: %s" % ",".join(p.src for p in in_params))
         eval.setVar("in", in_params)
+        eval.setVar("rundir", rundir)
+
+        # Set variables from the inputs
+        for need in self.needs:
+            for name,value in {"rundir" : need.rundir}.items():
+                eval.setVar("%s.%s" % (need.name, name), value)
 
         # Default inputs is the list of parameter sets that match 'consumes'
         inputs = []
@@ -138,8 +150,6 @@ class TaskNode(object):
                     if elem.find("${{") != -1:
                         new_val = eval.eval(elem)
                         value[i] = new_val
-            else:
-                raise Exception("Unhandled param type: %s" % str(value))
 
         input = TaskDataInput(
             name=self.name,

{dv_flow_mgr-0.0.1.13867752514a1 → dv_flow_mgr-0.0.1.13931887892a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.13867752514a1
+Version: 0.0.1.13931887892a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License