dv-flow-mgr 0.0.1.12941329363a1__tar.gz → 0.0.1.12941975786a1__tar.gz

{dv_flow_mgr-0.0.1.12941329363a1 → dv_flow_mgr-0.0.1.12941975786a1}/PKG-INFO

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

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

{dv_flow_mgr-0.0.1.12941329363a1 → dv_flow_mgr-0.0.1.12941975786a1}/src/dv_flow/mgr/std/fileset.py

@@ -25,21 +25,21 @@ class FileSet(Task):
 
         if self.params is not None:
             glob_root = os.path.join(self.srcdir, self.params.base)
+            glob_root = glob_root.strip()
 
-            print("glob_root: %s" % glob_root)
+            if glob_root[-1] == '/' or glob_root == '\\':
+                glob_root = glob_root[:-1]
 
             fs = _FileSet(
                 src=self.name, 
                 type=self.params.type,
                 basedir=glob_root)
-            print("glob_root: %s" % glob_root)
 
             if not isinstance(self.params.include, list):
                 self.params.include = [self.params.include]
 
             included_files = []
             for pattern in self.params.include:
-                print("pattern: %s" % pattern)
                 included_files.extend(glob.glob(os.path.join(glob_root, pattern), recursive=False))
 
             for file in included_files:

{dv_flow_mgr-0.0.1.12941329363a1 → dv_flow_mgr-0.0.1.12941975786a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -101,7 +101,6 @@ class TaskGraphBuilder(object):
         print("task_ctor=%s" % str(ctor_t.task_ctor), flush=True)
         task = ctor_t.task_ctor(
             name=task_name,
-            session=self,
             params=ctor_t.mkParams(),
             depends=depends,
             rundir=rundir,

{dv_flow_mgr-0.0.1.12941329363a1 → dv_flow_mgr-0.0.1.12941975786a1}/src/dv_flow/mgr/task_graph_runner_local.py

@@ -96,6 +96,7 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
                                 break
                 if t not in self.done_task_m.keys():
                     task_t = task_m[t]
+                    task_t.session = self
                     coro = asyncio.Task(task_t.do_run())
                     active_task_l.append((task_t, coro))
                

{dv_flow_mgr-0.0.1.12941329363a1 → dv_flow_mgr-0.0.1.12941975786a1}/src/dv_flow_mgr.egg-info/PKG-INFO

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

@@ -36,7 +36,6 @@ src/dv_flow/mgr/share/flow.json
 src/dv_flow/mgr/std/fileset.py
 src/dv_flow/mgr/std/flow.dv
 src/dv_flow/mgr/std/message.py
-src/dv_flow/mgr/std/task_fileset.py
 src/dv_flow/mgr/std/task_null.py
 src/dv_flow_mgr.egg-info/PKG-INFO
 src/dv_flow_mgr.egg-info/SOURCES.txt
@@ -45,6 +44,7 @@ src/dv_flow_mgr.egg-info/entry_points.txt
 src/dv_flow_mgr.egg-info/requires.txt
 src/dv_flow_mgr.egg-info/top_level.txt
 tests/examples/example1/example1.flow
+tests/sys/test_depends.py
 tests/sys/test_pkg_discovery.py
 tests/unit/__init__.py
 tests/unit/test_data_merge.py

dv_flow_mgr-0.0.1.12941975786a1/tests/sys/test_depends.py

@@ -0,0 +1,47 @@
+import os
+import pytest
+import subprocess
+import sys
+
+def test_seq_1(tmpdir):
+    rundir = os.path.join(tmpdir)
+
+    flow_dv = """
+package:
+  name: p1
+
+  tasks:
+  - name: files
+    uses: std.FileSet
+    with:
+      type: textFiles
+      include: "*.txt"
+
+  - name: print
+    uses: std.Message
+    with:
+      msg: "Running Print"
+"""
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+    
+    with open(os.path.join(rundir, "file.txt"), "w") as fp:
+        fp.write("Hello There\n")
+    
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = rundir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "run",
+        "print"
+    ]
+
+    output = subprocess.check_output(cmd, cwd=rundir, env=env)
+
+    output = output.decode()
+
+    assert output.find("Running Print") != -1

{dv_flow_mgr-0.0.1.12941329363a1 → dv_flow_mgr-0.0.1.12941975786a1}/tests/unit/test_fileset.py

@@ -52,3 +52,40 @@ def test_fileset_1(tmpdir):
 
     out = asyncio.run(runner.run(task))
     assert out.changed == True
+
+def test_glob_sys(tmpdir):
+    flow_dv = """
+package:
+  name: p1
+
+  tasks:
+  - name: glob
+    uses: std.FileSet
+    with:
+      type: systemVerilogSource
+      include: "*.sv"
+"""
+
+    rundir = os.path.join(tmpdir)
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+    
+    with open(os.path.join(rundir, "top.sv"), "w") as fp:
+        fp.write("\n")
+    
+    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("p1.glob")
+    output = asyncio.run(runner.run(task))
+
+    print("output: %s" % str(output))
+
+    assert len(output.filesets) == 1
+    fs = output.filesets[0]
+    assert len(fs.files) == 1
+    assert fs.files[0] == "top.sv"

dv_flow_mgr-0.0.1.12941329363a1/src/dv_flow/mgr/std/task_fileset.py

@@ -1,90 +0,0 @@
-import os
-import glob
-import fnmatch
-import pydantic.dataclasses as dc
-from ..fileset import FileSet
-from ..package import TaskCtor
-from ..task import Task, TaskParams
-from ..task_data import TaskData
-from ..task_memento import TaskMemento
-from typing import List, Tuple
-
-class TaskFileSet(Task):
-
-    async def run(self, input : TaskData) -> TaskData:
-        print("TaskFileSet run: %s: basedir=%s, base=%s type=%s include=%s" % (
-            self.name,
-            self.basedir,
-            self.params.base, self.params.type, str(self.params.include)
-        ))
-
-        glob_root = os.path.join(self.basedir, self.params.base)
-
-        ex_memento = self.getMemento(TaskFileSetMemento)
-
-        fs = FileSet(
-            src=self.name, 
-            type=self.params.type,
-            basedir=glob_root)
-        print("glob_root: %s" % glob_root)
-
-        if not isinstance(self.params.include, list):
-            self.params.include = [self.params.include]
-
-        included_files = []
-        for pattern in self.params.include:
-            print("pattern: %s" % pattern)
-            included_files.extend(glob.glob(os.path.join(glob_root, pattern), recursive=False))
-
-        memento = TaskFileSetMemento()
-        for file in included_files:
-            if not any(glob.fnmatch.fnmatch(file, os.path.join(glob_root, pattern)) for pattern in self.params.exclude):
-                memento.files.append((file, os.path.getmtime(os.path.join(glob_root, file))))
-                fs.files.append(file[len(glob_root):])
-
-        # Check to see if the filelist or fileset have changed
-        # Only bother doing this if the upstream task data has not changed
-        if ex_memento is not None and not input.changed:
-            ex_memento.files.sort(key=lambda x: x[0])
-            memento.files.sort(key=lambda x: x[0])
-            input.changed = ex_memento != memento
-        else:
-            input.changed = True
-
-        self.setMemento(memento)
-
-        input.addFileSet(fs)
-        return input
-
-class TaskFileSetParams(TaskParams):
-    base : str = ""
-    type : str = "Unknown"
-    include : List[str] = dc.Field(default_factory=list)
-    exclude : List[str] = dc.Field(default_factory=list)
-
-class TaskFileSetMemento(TaskMemento):
-    files : List[Tuple[str,float]] = dc.Field(default_factory=list)
-
-class TaskFileSetCtor(TaskCtor):
-
-    def mkTaskParams(self) -> TaskParams:
-        return TaskFileSetParams()
-    
-    def setTaskParams(self, params : TaskParams, pvals : dict):
-        for p in pvals.keys():
-            if not hasattr(params, p):
-                raise Exception("Unsupported parameter: " + p)
-            else:
-                setattr(params, p, pvals[p])
-
-    def mkTask(self, name : str, task_id : int, session : 'Session', params : TaskParams, depends : List['Task']) -> 'Task':
-        task = TaskFileSet(
-            name=name, 
-            task_id=task_id, 
-            session=session, 
-            params=params,
-            basedir=os.path.dirname(os.path.abspath(__file__)),
-            srcdir=os.path.dirname(os.path.abspath(__file__)))
-        task.depends.extend(depends)
-        return task
-