dv-flow-mgr 0.0.1.12922457458a1__tar.gz → 0.0.1.12932354274a1__tar.gz

{dv_flow_mgr-0.0.1.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/PKG-INFO

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

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

dv_flow_mgr-0.0.1.12922457458a1/src/dv_flow/mgr/parameters.py → dv_flow_mgr-0.0.1.12932354274a1/src/dv_flow/mgr/__main__.py

@@ -1,5 +1,5 @@
 #****************************************************************************
-#* parameters.py
+#* __main__.py
 #*
 #* Copyright 2023 Matthew Ballance and Contributors
 #*
@@ -19,9 +19,23 @@
 #*     Author: 
 #*
 #****************************************************************************
+import argparse
+from .cmds.cmd_run import CmdRun
 
-class Parameters(object):
+def get_parser():
+    parser = argparse.ArgumentParser(description='dv_flow_mgr')
+    subparsers = parser.add_subparsers(required=True)
 
-    def __init__(self):
-        pass
+    run_parser = subparsers.add_parser('run', help='run a flow')
+    run_parser.add_argument("tasks", nargs='*', help="tasks to run")
+    run_parser.set_defaults(func=CmdRun())
 
+    return parser
+
+def main():
+    parser = get_parser()
+    args = parser.parse_args()
+    args.func(args)
+
+if __name__ == "__main__":
+    main()

{dv_flow_mgr-0.0.1.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/src/dv_flow/mgr/package.py

@@ -20,22 +20,8 @@
 #*
 #****************************************************************************
 import dataclasses as dc
-import json
-from pydantic import BaseModel
-from typing import Any, Callable, Dict, List, Tuple
-from .flow import Flow
-from .task import TaskParams, TaskCtor
-from .task_def import TaskDef
-
-class PackageAcc(object):
-    pkg_spec : 'PackageSpec'
-    session : 'Session'
-    pkg : 'Package' = None
-
-    def getPackage(self) -> 'Package':
-        if self.pkg is None:
-            self.pkg = self.session.getPackage(self.pkg_spec)
-        return self.pkg
+from typing import Any, Dict
+from .task import TaskCtor
 
 @dc.dataclass
 class Package(object):
@@ -44,13 +30,7 @@ class Package(object):
     # Package holds constructors for tasks
     # - Dict holds the default parameters for the task
     tasks : Dict[str,TaskCtor] = dc.field(default_factory=dict)
-    imports : List['PackageAcc'] = dc.field(default_factory=list)
 
-    def getPackage(self, name : str) -> 'Package':
-        for p in self.imports:
-            if p.name == name:
-                return p.getPackage()
-            
     def getTaskCtor(self, name : str) -> TaskCtor:
         return self.tasks[name]
             

{dv_flow_mgr-0.0.1.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/src/dv_flow/mgr/package_def.py

@@ -28,7 +28,6 @@ import pydantic
 import pydantic.dataclasses as dc
 from pydantic import BaseModel
 from typing import Any, Dict, List, Callable, Tuple
-from .flow import Flow
 from .fragment_def import FragmentDef
 from .package import Package
 from .package_import_spec import PackageImportSpec, PackageSpec

dv_flow_mgr-0.0.1.12932354274a1/src/dv_flow/mgr/package_import_spec.py

@@ -0,0 +1,51 @@
+#****************************************************************************
+#* package_import_spec.py
+#*
+#* Copyright 2023 Matthew Ballance and Contributors
+#*
+#* Licensed under the Apache License, Version 2.0 (the "License"); you may 
+#* not use this file except in compliance with the License.  
+#* You may obtain a copy of the License at:
+#*
+#*   http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing, software 
+#* distributed under the License is distributed on an "AS IS" BASIS, 
+#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+#* See the License for the specific language governing permissions and 
+#* limitations under the License.
+#*
+#* Created on:
+#*     Author: 
+#*
+#****************************************************************************
+import pydantic.dataclasses as dc
+import json
+from typing import Dict, Any
+
+@dc.dataclass
+class PackageSpec(object):
+    name : str
+    params : Dict[str,Any] = dc.Field(default_factory=dict)
+    _fullname : str = None
+
+    def get_fullname(self) -> str:
+        if self._fullname is None:
+            if len(self.params) != 0:
+                self._fullname = "%s%s}" % (
+                    self.name,
+                    json.dumps(self.params, separators=(',', ':')))
+            else:
+                self._fullname = self.name
+        return self._fullname    
+    
+    def __hash__(self):
+        return hash(self.get_fullname())
+
+    def __eq__(self, value):
+        return isinstance(value, PackageSpec) and value.get_fullname() == self.get_fullname()
+
+@dc.dataclass
+class PackageImportSpec(PackageSpec):
+    path : str = dc.Field(default=None, alias="from")
+    alias : str = dc.Field(default=None, alias="as")

{dv_flow_mgr-0.0.1.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/src/dv_flow/mgr/pkg_rgy.py

@@ -1,3 +1,24 @@
+#****************************************************************************
+#* pkg_rgy.py
+#*
+#* Copyright 2023 Matthew Ballance and Contributors
+#*
+#* Licensed under the Apache License, Version 2.0 (the "License"); you may 
+#* not use this file except in compliance with the License.  
+#* You may obtain a copy of the License at:
+#*
+#*   http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing, software 
+#* distributed under the License is distributed on an "AS IS" BASIS, 
+#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+#* See the License for the specific language governing permissions and 
+#* limitations under the License.
+#*
+#* Created on:
+#*     Author: 
+#*
+#****************************************************************************
 import os
 import sys
 from typing import Dict, Tuple

{dv_flow_mgr-0.0.1.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/src/dv_flow/mgr/task.py

@@ -68,12 +68,8 @@ class Task(object):
     session : 'TaskGraphRunner' = None
     basedir : str = None
     memento : TaskMemento = None
-    depend_refs : List['TaskSpec'] = dc.field(default_factory=list)
-    depends : List[int] = dc.field(default_factory=list)
-    running : bool = False
-    output_set : bool = False
+    depends : List['Task'] = dc.field(default_factory=list)
     output : Any = None
-    output_ev : Any = asyncio.Event()
 
     # Implementation data below
     basedir : str = dc.field(default=None)
@@ -107,23 +103,13 @@ class Task(object):
     async def do_run(self) -> TaskData:
         print("do_run: %s - %d depends" % (self.name, len(self.depends)))
         if len(self.depends) > 0:
-            awaitables = [dep.waitOutput() for dep in self.depends]
-            deps_o = await asyncio.gather(*awaitables)
+            deps_o = []
+            for d in self.depends:
+                dep_o = d.getOutput()
+                if dep_o is None:
+                    raise Exception("Null output for %s" % d.name)
+                deps_o.append(dep_o)
 
-            # Merge filesets. A fileset with the same
-            print("deps_o: %s" % str(deps_o))
-
-
-#            print("deps_m: %s" % str(deps_m))
-
-            # Merge the output of the dependencies into a single input data
-#            if len(self.depends) > 1:
-#                raise Exception("TODO: handle >1 inputs")
-
-            # Now that we have a clean input object, we need
-            # to build the dep map
-
-#            input = self.depends[0].output.copy()
             input = TaskData.merge(deps_o)
             input.src = self.name
             input.deps[self.name] = list(inp.name for inp in self.depends)
@@ -137,29 +123,17 @@ class Task(object):
 
         self.init_rundir()
 
-        result = await self.run(input)
-
-        if not self.output_set:
-            if result is None:
-                result = TaskData()
+        self.output = await self.run(input)
 
-            # We perform an auto-merge algorithm if the task 
-            # doesn't take control
-#            for dep_o in deps_o:
-#                result.deps.append(dep_o.clone())
-
-            self.setOutput(result)
-        else:
-            # The task has taken control of the output
-            result = self.getOutput()
+        if self.output is None:
+            raise Exception("No output produced by %s" % self.name)
+            result = TaskData()
 
         # Write-back the memento, if specified
         self.save_memento()
 
-        self.running = False
-
         # Combine data from the deps to produce a result
-        return result
+        return self.output
 
     async def run(self, input : TaskData) -> TaskData:
         raise NotImplementedError("TaskImpl.run() not implemented")
@@ -173,24 +147,6 @@ class Task(object):
             with open(os.path.join(self.rundir, "memento.json"), "w") as fp:
                 fp.write(self.memento.model_dump_json(indent=2))
     
-    def setOutput(self, output : TaskData):
-        self.output_set = True
-        output.src = self.name
-        self.output = output
-        self.output_ev.set()
-
-    async def waitOutput(self) -> TaskData:
-        if not self.output_set:
-            if self.running:
-                # Task is already running
-                print("wait")
-                await self.output_ev.wait()
-            else:
-                self.running = True
-                print("start task")
-                await self.do_run()
-        return self.output
-    
     def getOutput(self) -> TaskData:
         return self.output
 

{dv_flow_mgr-0.0.1.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -1,3 +1,24 @@
+#****************************************************************************
+#* task_graph_builder.py
+#*
+#* Copyright 2023 Matthew Ballance and Contributors
+#*
+#* Licensed under the Apache License, Version 2.0 (the "License"); you may 
+#* not use this file except in compliance with the License.  
+#* You may obtain a copy of the License at:
+#*
+#*   http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing, software 
+#* distributed under the License is distributed on an "AS IS" BASIS, 
+#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+#* See the License for the specific language governing permissions and 
+#* limitations under the License.
+#*
+#* Created on:
+#*     Author: 
+#*
+#****************************************************************************
 import os
 import dataclasses as dc
 from .package import Package
@@ -87,13 +108,6 @@ class TaskGraphBuilder(object):
             rundir=rundir,
             srcdir=ctor_t.srcdir)
         
-        for i,d in enumerate(task.depend_refs):
-            if d in self._task_m.keys():
-                task.depends.append(self._task_m[d])
-            else:
-                print("mkTaskGraph: %s" % d)
-                task.depends.append(self._mkTaskGraph(d, parent_rundir))
-
         self._task_m[task.name] = task
 
         self._pkg_s.pop()

{dv_flow_mgr-0.0.1.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/src/dv_flow/mgr/task_graph_runner.py

@@ -1,5 +1,5 @@
 #****************************************************************************
-#* session.py
+#* task_graph_runner.py
 #*
 #* Copyright 2023 Matthew Ballance and Contributors
 #*

dv_flow_mgr-0.0.1.12932354274a1/src/dv_flow/mgr/util.py

@@ -0,0 +1,40 @@
+#****************************************************************************
+#* util.py
+#*
+#* Copyright 2023 Matthew Ballance and Contributors
+#*
+#* Licensed under the Apache License, Version 2.0 (the "License"); you may 
+#* not use this file except in compliance with the License.  
+#* You may obtain a copy of the License at:
+#*
+#*   http://www.apache.org/licenses/LICENSE-2.0
+#*
+#* Unless required by applicable law or agreed to in writing, software 
+#* distributed under the License is distributed on an "AS IS" BASIS, 
+#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+#* See the License for the specific language governing permissions and 
+#* limitations under the License.
+#*
+#* Created on:
+#*     Author: 
+#*
+#****************************************************************************
+import os
+import yaml
+from .package_def import PackageDef
+
+def loadProjPkgDef(path):
+    """Locates the project's flow spec and returns the PackageDef"""
+
+    dir = path
+    ret = None
+    while dir != "/" and dir != "" and os.path.isdir(dir):
+        if os.path.exists(os.path.join(dir, "flow.dv")):
+            with open(os.path.join(dir, "flow.dv")) as f:
+                data = yaml.load(f, Loader=yaml.FullLoader)
+                if "package" in data.keys():
+                    ret = PackageDef.load(os.path.join(dir, "flow.dv"))
+                    break
+        dir = os.path.dirname(dir)
+    return ret
+

{dv_flow_mgr-0.0.1.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12922457458a1
+Version: 0.0.1.12932354274a1
 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.12922457458a1 → dv_flow_mgr-0.0.1.12932354274a1}/src/dv_flow_mgr.egg-info/SOURCES.txt

@@ -18,12 +18,10 @@ docs/reference.rst
 src/dv_flow/mgr/__init__.py
 src/dv_flow/mgr/__main__.py
 src/dv_flow/mgr/fileset.py
-src/dv_flow/mgr/flow.py
 src/dv_flow/mgr/fragment_def.py
 src/dv_flow/mgr/package.py
 src/dv_flow/mgr/package_def.py
 src/dv_flow/mgr/package_import_spec.py
-src/dv_flow/mgr/parameters.py
 src/dv_flow/mgr/pkg_rgy.py
 src/dv_flow/mgr/task.py
 src/dv_flow/mgr/task_data.py

dv_flow_mgr-0.0.1.12922457458a1/src/dv_flow/mgr/__main__.py

@@ -1,21 +0,0 @@
-
-import argparse
-from .cmds.cmd_run import CmdRun
-
-def get_parser():
-    parser = argparse.ArgumentParser(description='dv_flow_mgr')
-    subparsers = parser.add_subparsers(required=True)
-
-    run_parser = subparsers.add_parser('run', help='run a flow')
-    run_parser.add_argument("tasks", nargs='*', help="tasks to run")
-    run_parser.set_defaults(func=CmdRun())
-
-    return parser
-
-def main():
-    parser = get_parser()
-    args = parser.parse_args()
-    args.func(args)
-
-if __name__ == "__main__":
-    main()

dv_flow_mgr-0.0.1.12922457458a1/src/dv_flow/mgr/flow.py

@@ -1,59 +0,0 @@
-#****************************************************************************
-#* flow.py
-#*
-#* Copyright 2023 Matthew Ballance and Contributors
-#*
-#* Licensed under the Apache License, Version 2.0 (the "License"); you may 
-#* not use this file except in compliance with the License.  
-#* You may obtain a copy of the License at:
-#*
-#*   http://www.apache.org/licenses/LICENSE-2.0
-#*
-#* Unless required by applicable law or agreed to in writing, software 
-#* distributed under the License is distributed on an "AS IS" BASIS, 
-#* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-#* See the License for the specific language governing permissions and 
-#* limitations under the License.
-#*
-#* Created on:
-#*     Author: 
-#*
-#****************************************************************************
-from pydantic import BaseModel, Field
-from typing import ClassVar
-#from .task import Task
-
-class Flow(BaseModel):
-    # - Parameters are user-facing 
-    # - Any implementation data must be stored elsewhere, such that it isn't
-    #   checked for equality...
-    name : str
-    description : str = Field(None)
-
-
-    @classmethod
-    def mk(cls, *args, **kwargs):
-        pass
-
-    async def my_method(self):
-        return Task(a,b,c)(self, input)
-
-#@extend(target)
-#class FlowExt(object):
-#    pass
-
-
-class Flow2(Flow):
-    description : str = "abc"
-
-    async def my_method(self):
-        super().my_method()
-
-f = Flow2(name="foo")
-
-#for d in dir(f):
-#    if not d.startswith("_"):
-#        print("%s: %s" % (d, str(getattr(f, d))))
-
-
-

dv_flow_mgr-0.0.1.12922457458a1/src/dv_flow/mgr/package_import_spec.py

@@ -1,31 +0,0 @@
-
-import pydantic.dataclasses as dc
-import json
-from typing import Dict, Any
-
-@dc.dataclass
-class PackageSpec(object):
-    name : str
-    params : Dict[str,Any] = dc.Field(default_factory=dict)
-    _fullname : str = None
-
-    def get_fullname(self) -> str:
-        if self._fullname is None:
-            if len(self.params) != 0:
-                self._fullname = "%s%s}" % (
-                    self.name,
-                    json.dumps(self.params, separators=(',', ':')))
-            else:
-                self._fullname = self.name
-        return self._fullname    
-    
-    def __hash__(self):
-        return hash(self.get_fullname())
-
-    def __eq__(self, value):
-        return isinstance(value, PackageSpec) and value.get_fullname() == self.get_fullname()
-
-@dc.dataclass
-class PackageImportSpec(PackageSpec):
-    path : str = dc.Field(default=None, alias="from")
-    alias : str = dc.Field(default=None, alias="as")

dv_flow_mgr-0.0.1.12922457458a1/src/dv_flow/mgr/util.py

@@ -1,19 +0,0 @@
-import os
-import yaml
-from .package_def import PackageDef
-
-def loadProjPkgDef(path):
-    """Locates the project's flow spec and returns the PackageDef"""
-
-    dir = path
-    ret = None
-    while dir != "/" and dir != "" and os.path.isdir(dir):
-        if os.path.exists(os.path.join(dir, "flow.dv")):
-            with open(os.path.join(dir, "flow.dv")) as f:
-                data = yaml.load(f, Loader=yaml.FullLoader)
-                if "package" in data.keys():
-                    ret = PackageDef.load(os.path.join(dir, "flow.dv"))
-                    break
-        dir = os.path.dirname(dir)
-    return ret
-