dv-flow-mgr 0.0.1.13885203883a1__py3-none-any.whl → 0.0.1.13931887892a1__py3-none-any.whl

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/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/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/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/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 = []

{dv_flow_mgr-0.0.1.13885203883a1.dist-info → dv_flow_mgr-0.0.1.13931887892a1.dist-info}/METADATA

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

@@ -13,11 +13,11 @@ dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=ObRf289sI1xzOudjO9MzyTVuKsz3AS949XA4Deyz-kE,1549
 dv_flow/mgr/param_ref_eval.py,sha256=5yH37oIX6f2qmk7GfRgNT5qZx0jm3CJFgB9lLDZZ1yQ,1981
 dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
-dv_flow/mgr/pkg_rgy.py,sha256=U5LgBsdCpVJ7tXjlTsn_Qjf9OoEEOjyWsYNsOecS2uQ,5337
+dv_flow/mgr/pkg_rgy.py,sha256=d1nIjRm3ymMNJT-yiMDxCS6bFisTPvLMqh5VrfsHVKM,5404
 dv_flow/mgr/task.py,sha256=BmS0wd51l4tpTrsit3-ugCB5VGnwpMJNl0dfJfHS4DQ,5981
 dv_flow/mgr/task_ctor.py,sha256=YDYb5uW9Js7MnA8GqbYJljNCbeJFKGveZ2v-IJRgIa8,2221
 dv_flow/mgr/task_data.py,sha256=ysawiUcbQu-ImNSgU5LsfOWlBKdfBt_8juwSacnAqAQ,11437
-dv_flow/mgr/task_def.py,sha256=BJKZZE8yO_kcKaf36HnzTkhYaC0DPIya4IKlKNM4s5I,2080
+dv_flow/mgr/task_def.py,sha256=0rVlDjNF39PQ_0uzkSuOgvE2sZjFwpTAR8HIu_Arbog,2140
 dv_flow/mgr/task_exec_data.py,sha256=-mh9G2-iq6ioB7v7QrHiQAOEwd_hDKhnVf2Mb_IHRtg,1483
 dv_flow/mgr/task_graph_builder.py,sha256=EYFsMZCDDHMEFWZOVSpPb7KBVE6N6XyL4KFzJVrPSPE,10106
 dv_flow/mgr/task_graph_runner.py,sha256=LZ5cTXLQlcK348AxTYKqfpsFFmxA3aseGfholvQW39s,2187
@@ -25,7 +25,7 @@ dv_flow/mgr/task_graph_runner_local.py,sha256=quAxmF1go2iVhBDieksg3brAZukIvpvF-8
 dv_flow/mgr/task_impl_data.py,sha256=jpO7kQ6AjYcOOfpgFIPCEYA1pQbVwFcIY_SY3Q53eGk,1163
 dv_flow/mgr/task_listener_log.py,sha256=b7caUHERGkN6eT8IinBJTdZpwASUs8xAqDmtEymMKzQ,3529
 dv_flow/mgr/task_memento.py,sha256=CV3d1J4ADhMpqvYPfWvUI7duSFCbLEzY41y2GZBHIhM,1101
-dv_flow/mgr/task_node.py,sha256=xPCarkVSj9rZ1v12WiHtMOe-nMKHbkaUpP9-edQOXek,14828
+dv_flow/mgr/task_node.py,sha256=DL7gI79uu0yoaz2J7PJhr91isL42agATbLDO0ngGqi4,15215
 dv_flow/mgr/task_output.py,sha256=ZwyvwnYj_gHOEFAEOH3m24Xfc4Cn77hb1j7LkX8_3C4,1086
 dv_flow/mgr/task_params_ctor.py,sha256=BPkbnoCtzhCxc1g8CJ6VimCcm5UAu92PXeDMhQ4lYsQ,1957
 dv_flow/mgr/task_runner.py,sha256=TB4feCEItxufUyyBSwNNY3OkQ0yjSO0fUfjga0u7rsg,8790
@@ -35,14 +35,14 @@ dv_flow/mgr/util.py,sha256=BLp-25Ph9roqo1O3VHI5sKhwxQ0wUU7znFwcSKt0hpA,1442
 dv_flow/mgr/cmds/cmd_run.py,sha256=lNMvpiyKf-Ehs0GUkzcOIoJxaXgeLKv6UFNakcm9_hw,3303
 dv_flow/mgr/share/flow.json,sha256=lNmZex9NXkYbyb2aZseQfUOkV9CMyfH0iLODEI7EPBw,5096
 dv_flow/mgr/std/create_file.py,sha256=wmn5N_mObx_wr2LPdKOVbNmdM71hhs3UXOv6Ap9l3Ts,2726
-dv_flow/mgr/std/exec.py,sha256=hGvZke853iee1xw8r80vra5WLcCKveXbNHuSu3kC2Yw,1285
+dv_flow/mgr/std/exec.py,sha256=kU9S8mIBDvZFqcWGGe9RQIfeldDw2g2eGBBh-po0ePQ,1302
 dv_flow/mgr/std/fileset.py,sha256=5IxS6T-x0wzA6fdEQcfHZ9kNP8IpH9hfJ3UMhL4A6Iw,3911
-dv_flow/mgr/std/flow.dv,sha256=CcQOvSfT0JgsaNf7dH8gfbG8lPvQQXw9W9gqrT52Pw0,2025
+dv_flow/mgr/std/flow.dv,sha256=Ehw0rrFcHoXt3WudeJ5PyPXpVtUcvvWGm43ikUWl-lE,2602
 dv_flow/mgr/std/message.py,sha256=_Gox9oBzL9ZYG1JfJ-WYPXojVLqGNaKxZ9tpLVT0LO0,1035
 dv_flow/mgr/std/task_null.py,sha256=dw6LXBXVwth6gLPeduDvlz5znAhcVpDH8r1DticD-0w,1041
-dv_flow_mgr-0.0.1.13885203883a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.1.13885203883a1.dist-info/METADATA,sha256=lH34dG2edpLv69XsxqBilTInQ_C4sfWeBkvy_3xM-Cw,13314
-dv_flow_mgr-0.0.1.13885203883a1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-dv_flow_mgr-0.0.1.13885203883a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.1.13885203883a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.1.13885203883a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.1.13931887892a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.1.13931887892a1.dist-info/METADATA,sha256=D2JLp63FgCw_yZC_bdxrl76DDLMzyI4By_K7mhYYhmM,13314
+dv_flow_mgr-0.0.1.13931887892a1.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+dv_flow_mgr-0.0.1.13931887892a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.1.13931887892a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.1.13931887892a1.dist-info/RECORD,,

{dv_flow_mgr-0.0.1.13885203883a1.dist-info → dv_flow_mgr-0.0.1.13931887892a1.dist-info}/WHEEL

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