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

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

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

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

{dv_flow_mgr-0.0.1.12932354274a1 → dv_flow_mgr-0.0.1.12941329363a1}/src/dv_flow/mgr/cmds/cmd_run.py

@@ -59,6 +59,8 @@ class CmdRun(object):
         tasks = []
 
         for spec in args.tasks:
+            if spec.find('.') == -1:
+                spec = pkg.name + "." + spec
             task = builder.mkTaskGraph(spec)
             tasks.append(task)
 

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

@@ -31,13 +31,11 @@ class PkgRgy(object):
         self._pkgpath = []
         self._pkg_m : Dict[str, Tuple[str,PackageDef]] = {}
 
-    def hasPackage(self, name, search_path=False):
+    def hasPackage(self, name, search_path=True):
         if name in self._pkg_m.keys():
             return True
-        elif search_path:
-            for p in self._pkgpath:
-                if os.path.exists(os.path.join(p, name)):
-                    return True
+        elif search_path and self._findOnPath(name) is not None:
+            return True
         else:
             return False
     
@@ -50,11 +48,33 @@ class PkgRgy(object):
                     self._pkg_m[name][0],
                     pkg_def
                 )
-                pass
             return self._pkg_m[name][1]
         else:
-            # Go search the package path
-            return None
+            return self._findOnPath(name)
+        
+    def _findOnPath(self, name):
+        name_s = name.split('.')
+        name_dir = "/".join(name_s)
+        if len(name_s) > 1:
+            name_pref = "/".join(name_s[:-1])
+        else:
+            name_pref = None
+
+        pkg = None
+
+        for path in self._pkgpath:
+            if os.path.isfile(os.path.join(path, name_dir, "flow.dv")):
+                pkg = PackageDef.load(os.path.join(path, name_dir, "flow.dv"))
+            elif name_pref is not None and os.path.isfile(os.path.join(path, name_pref, name_s[-1] + ".dv")):
+                pkg = PackageDef.load(os.path.join(path, name_pref, name_s[-1] + ".dv"))
+            elif os.path.isfile(os.path.join(path, name + ".dv")):
+                pkg = PackageDef.load(os.path.join(path, name + ".dv"))
+
+            if pkg is not None:
+                self._pkg_m[name] = (pkg.name, pkg)
+                break
+
+        return pkg
 
     def registerPackage(self, pkg_def):
         if pkg_def.name in self._pkg_m.keys():
@@ -65,6 +85,10 @@ class PkgRgy(object):
         # Register built-in package
         self._pkg_m["std"] = (os.path.join(os.path.dirname(__file__), "std/flow.dv"), None)
 
+        if "DV_FLOW_PATH" in os.environ.keys() and os.environ["DV_FLOW_PATH"] != "":
+            paths = os.environ["DV_FLOW_PATH"].split(':')
+            self._pkgpath.extend(paths)
+
         if sys.version_info < (3,10):
             from importlib_metadata import entry_points
         else:

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

@@ -35,7 +35,6 @@ class TaskGraphBuilder(object):
     pkg_rgy : PkgRgy = None
     _pkg_s : List[Package] = dc.field(default_factory=list)
     _pkg_m : Dict[PackageSpec,Package] = dc.field(default_factory=dict)
-    _pkg_def_m : Dict[str,PackageDef] = dc.field(default_factory=dict)
     _pkg_spec_s : List[PackageDef] = dc.field(default_factory=list)
     _task_m : Dict[TaskSpec,Task] = dc.field(default_factory=dict)
 
@@ -127,8 +126,6 @@ class TaskGraphBuilder(object):
         else:
             pkg_def = None
 
-        print("spec: %s ; _pkg_def_m: %s" % (str(spec), str(self._pkg_def_m.keys())))
-
         # Need a stack to track which package we are currently in
         # Need a map to get a concrete package from a name with parameterization
 
@@ -140,8 +137,9 @@ class TaskGraphBuilder(object):
             pkg = self._pkg_s[-1]
         if spec in self._pkg_m.keys():
             pkg = self._pkg_m[spec]
-        elif spec in self._pkg_def_m.keys():
-            pkg = self._pkg_def_m[spec].mkPackage(self)
+        elif self.pkg_rgy.hasPackage(spec.name):
+            pkg_def = self.pkg_rgy.getPackage(spec.name)
+            pkg = pkg_def.mkPackage(self)
             self._pkg_m[spec] = pkg
         else:
             pkg = None
@@ -156,22 +154,26 @@ class TaskGraphBuilder(object):
                         tgt_pkg_spec = PackageSpec(imp.name)
                         if tgt_pkg_spec in self._pkg_m.keys():
                             pkg = self._pkg_m[tgt_pkg_spec]
-                        elif tgt_pkg_spec in self._pkg_def_m.keys():
-                            base = self._pkg_def_m[tgt_pkg_spec]
+                        elif self.pkg_rgy.hasPackage(tgt_pkg_spec.name):
+                            base = self.pkg_rgy.getPackage(tgt_pkg_spec.name)
                             pkg = base.mkPackage(self, spec.params)
                             self._pkg_m[spec] = pkg
                         elif imp.path is not None:
                             # See if we can load the package
                             print("TODO: load referenced package")
                         else:
-                            raise Exception("Import alias %s not found" % imp.name)
+                            raise Exception("Failed to resolve target (%s) of import alias %s" % (
+                                imp.name,
+                                imp.alias))
                         break
                     else:
                         # Need to compare the spec with the full import spec
                         imp_spec = PackageSpec(imp.name)
                         # TODO: set parameters
                         if imp_spec == spec:
-                            base = self._pkg_def_m[PackageSpec(spec.name)]
+                            base = self.pkg_rgy.getPackage(spec.name)
+                            if base is None:
+                                raise Exception("Failed to find imported package %s" % spec.name)
                             pkg = base.mkPackage(self, spec.params)
                             self._pkg_m[spec] = pkg
                             break

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

@@ -74,6 +74,8 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
         print("dep_m: %s" % str(dep_m))
 
         order = list(toposort(dep_m))
+        
+        print("order: %s" % str(order))
 
         active_task_l : List[Tuple[Task,Coroutine]]= []
         # Now, iterate over the concurrent sets
@@ -93,9 +95,9 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
                                 active_task_l.pop(i)
                                 break
                 if t not in self.done_task_m.keys():
-                    task = task_m[t]
-                    coro = asyncio.Task(task.do_run())
-                    active_task_l.append((task, coro))
+                    task_t = task_m[t]
+                    coro = asyncio.Task(task_t.do_run())
+                    active_task_l.append((task_t, coro))
                
             # Now, wait for tasks to complete
             if len(active_task_l):
@@ -110,7 +112,7 @@ class TaskGraphRunnerLocal(TaskGraphRunner):
         ret = None
 
         if unwrap:
-            return task.output
+            return task[0].output
         else:
             return list(t.output for t in task)
         

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

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

@@ -45,6 +45,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_pkg_discovery.py
 tests/unit/__init__.py
 tests/unit/test_data_merge.py
 tests/unit/test_fileset.py

dv_flow_mgr-0.0.1.12941329363a1/tests/sys/test_pkg_discovery.py

@@ -0,0 +1,108 @@
+import os
+import pytest
+import subprocess
+import sys
+
+
+def test_import_specific(tmpdir):
+    flow_dv = """
+package:
+  name: p1
+
+  imports:
+  - name: p2
+
+  tasks:
+  - name: my_task
+    uses: p2.doit
+"""
+
+    p2_flow_dv = """
+package:
+  name: p2
+
+  tasks:
+  - name: doit
+    uses: std.Message
+    with:
+      msg: "Hello There"
+"""
+
+    rundir = os.path.join(tmpdir)
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+
+    os.makedirs(os.path.join(rundir, "p2"))
+    with open(os.path.join(rundir, "p2/flow.dv"), "w") as fp:
+        fp.write(p2_flow_dv)
+
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = rundir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "run",
+        "my_task"
+    ]
+
+    output = subprocess.check_output(cmd, cwd=rundir, env=env)
+
+    output = output.decode()
+
+    assert output.find("Hello There") != -1
+
+
+def test_import_alias(tmpdir):
+    flow_dv = """
+package:
+  name: p1
+
+  imports:
+  - name: p2
+    as: p3
+
+  tasks:
+  - name: my_task
+    uses: p3.doit
+"""
+
+    p2_flow_dv = """
+package:
+  name: p2
+
+  tasks:
+  - name: doit
+    uses: std.Message
+    with:
+      msg: "Hello There"
+"""
+
+    rundir = os.path.join(tmpdir)
+
+    with open(os.path.join(rundir, "flow.dv"), "w") as fp:
+        fp.write(flow_dv)
+
+    os.makedirs(os.path.join(rundir, "p2"))
+    with open(os.path.join(rundir, "p2/flow.dv"), "w") as fp:
+        fp.write(p2_flow_dv)
+
+    env = os.environ.copy()
+    env["DV_FLOW_PATH"] = rundir
+
+    cmd = [
+        sys.executable,
+        "-m",
+        "dv_flow.mgr",
+        "run",
+        "my_task"
+    ]
+
+    output = subprocess.check_output(cmd, cwd=rundir, env=env)
+
+    output = output.decode()
+
+    assert output.find("Hello There") != -1
+