dv-flow-mgr 0.0.1.12911707440a1__tar.gz → 0.0.1.12919555073a1__tar.gz

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12911707440a1
+Version: 0.0.1.12919555073a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License
@@ -206,6 +206,7 @@ License:                                  Apache License
            limitations under the License.
         
 License-File: LICENSE
+Requires-Dist: pydantic
 Requires-Dist: pyyaml
 Requires-Dist: toposort
 Requires-Dist: svdep

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/ivpm.yaml

@@ -15,12 +15,7 @@ package:
     deps:
     - name: pytest
       src: pypi
-    - name: svdep
-      url: https://github.com/fvutils/svdep.git
-      anonymous: True
-    - name: dv-flow-lib-hdlsim
-      url: http://github.com/dv-flow/dv-flow-lib-hdlsim.git
-    - name: ply 
+    - name: pydantic
       src: pypi
     - name: pyyaml
       src: pypi

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/pyproject.toml

@@ -5,9 +5,10 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dv-flow-mgr"
-version = "0.0.1.12911707440a1"
+version = "0.0.1.12919555073a1"
 dependencies = [
-    "pyyaml",
+    'pydantic',
+    'pyyaml',
     "toposort",
     "svdep"
 ]

dv_flow_mgr-0.0.1.12919555073a1/src/dv_flow/mgr/__init__.py

@@ -0,0 +1,9 @@
+
+from .package_def import *
+from .task_graph_runner import *
+from .task import *
+from .task_data import *
+from .task_graph_runner import TaskGraphRunner
+from .task_graph_runner_local import TaskGraphRunnerLocal
+from .task_graph_builder import TaskGraphBuilder
+

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -99,7 +99,6 @@ class TaskGraphBuilder(object):
         print("getPackage: %s len: %d" % (spec.name, len(self._pkg_spec_s)))
         if len(self._pkg_spec_s) > 0:
             pkg_spec = self._pkg_spec_s[-1]
-            print("pkg_spec: %s ; root_pkg: %s" % (pkg_spec.name, self.root_pkg.name))
             if self.root_pkg.name == pkg_spec.name:
                 pkg_def = self.root_pkg
             else:

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/src/dv_flow/mgr/task_graph_runner_local.py

@@ -1,5 +1,5 @@
 #****************************************************************************
-#* session.py
+#* task_graph_runner_local.py
 #*
 #* Copyright 2023 Matthew Ballance and Contributors
 #*
@@ -58,11 +58,19 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
 
     async def run(self, task : Union[Task,List[Task]]) -> List['TaskData']:
         if isinstance(task, Task):
+            unwrap = True
             task = [task]
+        else:
+            unwrap = False
         
         run_o = list(t.do_run() for t in task)
 
-        return await asyncio.gather(*run_o)
+        ret = await asyncio.gather(*run_o)
+
+        if unwrap:
+            return ret[0]
+        else:
+            return ret
     
     async def runTask(self, task : Task) -> 'TaskData':
         return await task.do_run()

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dv-flow-mgr
-Version: 0.0.1.12911707440a1
+Version: 0.0.1.12919555073a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License
@@ -206,6 +206,7 @@ License:                                  Apache License
            limitations under the License.
         
 License-File: LICENSE
+Requires-Dist: pydantic
 Requires-Dist: pyyaml
 Requires-Dist: toposort
 Requires-Dist: svdep

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/src/dv_flow_mgr.egg-info/requires.txt

@@ -1,3 +1,4 @@
+pydantic
 pyyaml
 toposort
 svdep

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/tests/unit/test_data_merge.py

@@ -5,10 +5,9 @@ import dataclasses as dc
 import pytest
 from typing import List
 import yaml
-from dv_flow_mgr import TaskData, FileSet, Session, TaskData, TaskDataParamKindE
+from dv_flow.mgr import TaskData, FileSet, TaskData, TaskDataParamKindE
 from pydantic import BaseModel
 from shutil import copytree
-from .tasklib import TaskNull
 
 def test_empty_in():
 

dv_flow_mgr-0.0.1.12919555073a1/tests/unit/test_fileset.py

@@ -0,0 +1,54 @@
+import asyncio
+import io
+import os
+import dataclasses as dc
+import pytest
+from typing import List
+import yaml
+from dv_flow.mgr import PackageDef, TaskGraphBuilder, TaskGraphRunnerLocal
+from pydantic import BaseModel
+from shutil import copytree
+
+def test_fileset_1(tmpdir):
+    """"""
+    datadir = os.path.join(os.path.dirname(__file__), "data/fileset")
+
+    copytree(
+        os.path.join(datadir, "test1"), 
+        os.path.join(tmpdir, "test1"))
+    
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "test1", "flow.dv"))
+    builder = TaskGraphBuilder(
+        pkg_def,
+        os.path.join(tmpdir, "rundir"))
+    task = builder.mkTaskGraph("test1.files1")
+    runner = TaskGraphRunnerLocal(rundir=os.path.join(tmpdir, "rundir"))
+
+    out = asyncio.run(runner.run(task))
+    assert out.changed == True
+
+    # Now, re-run using the same run directory.
+    # Since the files haven't changed, the output must indicate that
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "test1", "flow.dv"))
+    builder = TaskGraphBuilder(
+        pkg_def,
+        os.path.join(tmpdir, "rundir"))
+    task = builder.mkTaskGraph("test1.files1")
+    runner = TaskGraphRunnerLocal(rundir=os.path.join(tmpdir, "rundir"))
+
+    out = asyncio.run(runner.run(task))
+    assert out.changed == False
+
+    # Now, add a files
+    with open(os.path.join(tmpdir, "test1", "files1", "file1_3.sv"), "w") as f:
+        f.write("// file1_3.sv\n")
+
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "test1", "flow.dv"))
+    builder = TaskGraphBuilder(
+        pkg_def,
+        os.path.join(tmpdir, "rundir"))
+    task = builder.mkTaskGraph("test1.files1")
+    runner = TaskGraphRunnerLocal(rundir=os.path.join(tmpdir, "rundir"))
+
+    out = asyncio.run(runner.run(task))
+    assert out.changed == True

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/tests/unit/test_pyclass.py

@@ -2,7 +2,7 @@
 import os
 import asyncio
 import pytest
-from dv_flow_mgr import Session, TaskData
+from dv_flow.mgr import TaskGraphBuilder, TaskGraphRunnerLocal, PackageDef
 #from dv_flow_mgr.tasklib.builtin_pkg import TaskPyClass, TaskPyClassParams
 
 # def test_smoke(tmpdir):
@@ -43,7 +43,7 @@ package:
         value: "1"
 """
     module = """
-from dv_flow_mgr import Task, TaskData
+from dv_flow.mgr import Task, TaskData
 
 class foo(Task):
     async def run(self, input : TaskData) -> TaskData:
@@ -58,10 +58,15 @@ class foo(Task):
         f.write(flow)
 
     rundir = os.path.join(tmpdir, "rundir")
-    session = Session(os.path.join(tmpdir), rundir)
-    session.load()
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "flow.dv"))
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=os.path.join(tmpdir, "rundir"))
+    runner = TaskGraphRunnerLocal(rundir=os.path.join(tmpdir, "rundir"))
+
+    task = builder.mkTaskGraph("pkg1.foo")
+    output = asyncio.run(runner.run(task))
 
-    output = asyncio.run(session.run("pkg1.foo"))
 
 def test_class_use(tmpdir):
     # Test that we can 
@@ -79,7 +84,7 @@ package:
     uses: foo
 """
     module = """
-from dv_flow_mgr import Task, TaskData
+from dv_flow.mgr import Task, TaskData
 
 class foo(Task):
     async def run(self, input : TaskData) -> TaskData:
@@ -93,11 +98,14 @@ class foo(Task):
     with open(os.path.join(tmpdir, "flow.dv"), "w") as f:
         f.write(flow)
 
-    rundir = os.path.join(tmpdir, "rundir")
-    session = Session(os.path.join(tmpdir), rundir)
-    session.load()
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "flow.dv"))
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=os.path.join(tmpdir, "rundir"))
+    runner = TaskGraphRunnerLocal(rundir=os.path.join(tmpdir, "rundir"))
 
-    output = asyncio.run(session.run("pkg1.foo2"))
+    task = builder.mkTaskGraph("pkg1.foo2")
+    output = asyncio.run(runner.run(task))
 
 def test_class_use_with(tmpdir):
     # Test that we can 
@@ -118,7 +126,7 @@ package:
 
 """
     module = """
-from dv_flow_mgr import Task, TaskData
+from dv_flow.mgr import Task, TaskData
 
 class foo(Task):
     async def run(self, input : TaskData) -> TaskData:
@@ -132,11 +140,14 @@ class foo(Task):
     with open(os.path.join(tmpdir, "flow.dv"), "w") as f:
         f.write(flow)
 
-    rundir = os.path.join(tmpdir, "rundir")
-    session = Session(os.path.join(tmpdir), rundir)
-    session.load()
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "flow.dv"))
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=os.path.join(tmpdir, "rundir"))
+    runner = TaskGraphRunnerLocal(rundir=os.path.join(tmpdir, "rundir"))
 
-    output = asyncio.run(session.run("pkg1.foo2"))
+    task = builder.mkTaskGraph("pkg1.foo")
+    output = asyncio.run(runner.run(task))
 
 def test_class_use_with_new_param(tmpdir):
     # Test that we can 
@@ -160,7 +171,7 @@ package:
 
 """
     module = """
-from dv_flow_mgr import Task, TaskData
+from dv_flow.mgr import Task, TaskData
 
 class foo(Task):
     async def run(self, input : TaskData) -> TaskData:
@@ -174,8 +185,11 @@ class foo(Task):
     with open(os.path.join(tmpdir, "flow.dv"), "w") as f:
         f.write(flow)
 
-    rundir = os.path.join(tmpdir, "rundir")
-    session = Session(os.path.join(tmpdir), rundir)
-    session.load()
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "flow.dv"))
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=os.path.join(tmpdir, "rundir"))
+    runner = TaskGraphRunnerLocal(rundir=os.path.join(tmpdir, "rundir"))
 
-    output = asyncio.run(session.run("pkg1.foo2"))
+    task = builder.mkTaskGraph("pkg1.foo2")
+    output = asyncio.run(runner.run(task))

{dv_flow_mgr-0.0.1.12911707440a1 → dv_flow_mgr-0.0.1.12919555073a1}/tests/unit/test_smoke.py

@@ -5,7 +5,7 @@ import dataclasses as dc
 import pytest
 from typing import List
 import yaml
-from dv_flow_mgr import FileSet, PackageDef, Session, TaskData
+from dv_flow.mgr import FileSet, PackageDef, TaskData
 from pydantic import BaseModel
 from shutil import copytree
 

dv_flow_mgr-0.0.1.12919555073a1/tests/unit/test_stdlib.py

@@ -0,0 +1,35 @@
+import os
+import asyncio
+import pytest
+from dv_flow.mgr import TaskGraphBuilder, TaskGraphRunnerLocal, PackageDef
+from dv_flow.mgr.util import loadProjPkgDef
+
+def test_message(tmpdir, capsys):
+    flow = """
+package:
+  name: pkg1
+  tasks:
+  - name: foo
+    uses: std.Message
+    with:
+      msg: "Hello, World!"
+"""
+
+    with open(os.path.join(tmpdir, "flow.dv"), "w") as f:
+        f.write(flow)
+
+    rundir = os.path.join(tmpdir, "rundir")
+
+    pkg_def = loadProjPkgDef(os.path.join(tmpdir))
+    assert pkg_def is not None
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=rundir)
+    runner = TaskGraphRunnerLocal(rundir=rundir)
+
+    task = builder.mkTaskGraph("pkg1.foo")
+
+    output = asyncio.run(runner.run(task))
+
+    captured = capsys.readouterr()
+    assert captured.out.find("Hello, World!") >= 0

dv_flow_mgr-0.0.1.12911707440a1/src/dv_flow/mgr/__init__.py

@@ -1,6 +0,0 @@
-
-from .package_def import *
-from .task_graph_runner import *
-from .task import *
-from .task_data import *
-

dv_flow_mgr-0.0.1.12911707440a1/tests/unit/test_fileset.py

@@ -1,48 +0,0 @@
-import asyncio
-import io
-import os
-import dataclasses as dc
-import pytest
-from typing import List
-import yaml
-from dv_flow_mgr import FileSet, PackageDef, Session, TaskData
-from pydantic import BaseModel
-from shutil import copytree
-
-def test_fileset_1(tmpdir):
-    """"""
-    datadir = os.path.join(os.path.dirname(__file__), "data/fileset")
-
-    copytree(
-        os.path.join(datadir, "test1"), 
-        os.path.join(tmpdir, "test1"))
-    
-    session = Session(
-        os.path.join(tmpdir, "test1"),
-        os.path.join(tmpdir, "rundir"))
-    session.load()
-
-    out = asyncio.run(session.run("test1.files1"))
-    assert out.changed == True
-
-    # Now, re-run using the same run directory.
-    # Since the files haven't changed, the output must indicate that
-    session = Session(
-        os.path.join(tmpdir, "test1"),
-        os.path.join(tmpdir, "rundir"))
-    session.load()
-
-    out = asyncio.run(session.run("test1.files1"))
-    assert out.changed == False
-
-    # Now, manually change one of the files
-    with open(os.path.join(tmpdir, "test1", "files1", "file1_1.sv"), "w") as f:
-        f.write("// file1_1.sv\n")
-
-    session = Session(
-        os.path.join(tmpdir, "test1"),
-        os.path.join(tmpdir, "rundir"))
-    session.load()
-
-    out = asyncio.run(session.run("test1.files1"))
-    assert out.changed == True

dv_flow_mgr-0.0.1.12911707440a1/tests/unit/test_stdlib.py

@@ -1,27 +0,0 @@
-import os
-import asyncio
-import pytest
-from dv_flow_mgr import Session, TaskData
-
-def test_message(tmpdir, capsys):
-    flow = """
-package:
-  name: pkg1
-  tasks:
-  - name: foo
-    uses: std.Message
-    with:
-      msg: "Hello, World!"
-"""
-
-    with open(os.path.join(tmpdir, "flow.dv"), "w") as f:
-        f.write(flow)
-
-    rundir = os.path.join(tmpdir, "rundir")
-    session = Session(os.path.join(tmpdir), rundir)
-    session.load()
-
-    output = asyncio.run(session.run("pkg1.foo"))
-
-    captured = capsys.readouterr()
-    assert captured.out.find("Hello, World!") >= 0