dv-flow-mgr 0.0.1.13711470441a1__tar.gz → 0.0.1.13711946395a1__tar.gz

{dv_flow_mgr-0.0.1.13711470441a1 → dv_flow_mgr-0.0.1.13711946395a1}/PKG-INFO

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

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

{dv_flow_mgr-0.0.1.13711470441a1 → dv_flow_mgr-0.0.1.13711946395a1}/src/dv_flow/mgr/pkg_rgy.py

@@ -122,6 +122,12 @@ class PkgRgy(object):
         # for pkg in self._load_pkg_list():
         #     self._pkgs[pkg.name] = pkg
 
+    def copy(self):
+        ret = PkgRgy()
+        ret._pkgpath = self._pkgpath.copy()
+        ret._pkg_m = self._pkg_m.copy()
+        return ret
+
     @classmethod
     def inst(cls):
         if cls._inst is None:

{dv_flow_mgr-0.0.1.13711470441a1 → dv_flow_mgr-0.0.1.13711946395a1}/src/dv_flow/mgr/task_graph_builder.py

@@ -43,7 +43,7 @@ class TaskGraphBuilder(object):
 
     def __post_init__(self):
         if self.pkg_rgy is None:
-            self.pkg_rgy = PkgRgy.inst()
+            self.pkg_rgy = PkgRgy.inst().copy()
 
         self._logger = logging.getLogger(type(self).__name__)
         self._logger.debug("TaskGraphBuilder: root_pkg: %s" % str(self.root_pkg))
@@ -51,6 +51,7 @@ class TaskGraphBuilder(object):
         if self.root_pkg is not None:
 
             # Register package definitions found during loading
+            self._logger.debug("Packages: %s" % str(self.root_pkg))
             for subpkg in self.root_pkg.subpkg_m.values():
                 self._logger.debug("Registering package %s" % subpkg.name)
                 self.pkg_rgy.registerPackage(subpkg)
@@ -110,9 +111,11 @@ class TaskGraphBuilder(object):
         needs = []
 
         for need_def in ctor_t.getNeeds():
+            # Resolve the full name of the need
+            need_fullname = self._resolveNeedRef(need_def)
             if not need_def in self._task_m.keys():
-                task = self._mkTaskGraph(need_def, rundir)
-                self._task_m[need_def] = task
+                need_t = self._mkTaskGraph(need_def, rundir)
+                self._task_m[need_def] = need_t
             needs.append(self._task_m[need_def])
 
         # The returned task should have all param references resolved
@@ -134,6 +137,13 @@ class TaskGraphBuilder(object):
 
         return task
 
+    def _resolveNeedRef(self, need_def) -> str:
+        if need_def.find(".") == -1:
+            # Need is a local task. Prefix to avoid ambiguity
+            return self._pkg_s[-1].name + "." + need_def
+        else:
+            return need_def
+
     def getPackage(self, spec : PackageSpec) -> Package:
         # Obtain the active package definition
         self._logger.debug("--> getPackage: %s len: %d" % (spec.name, len(self._pkg_spec_s)))

{dv_flow_mgr-0.0.1.13711470441a1 → dv_flow_mgr-0.0.1.13711946395a1}/src/dv_flow_mgr.egg-info/PKG-INFO

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

@@ -77,6 +77,7 @@ tests/unit/test_data_merge.py
 tests/unit/test_expr_eval.py
 tests/unit/test_expr_parser.py
 tests/unit/test_fileset.py
+tests/unit/test_imports.py
 tests/unit/test_parse.py
 tests/unit/test_pyclass.py
 tests/unit/test_pytask_smoke.py

dv_flow_mgr-0.0.1.13711946395a1/tests/unit/test_imports.py

@@ -0,0 +1,112 @@
+
+import asyncio
+import io
+import json
+import os
+import dataclasses as dc
+import pytest
+from typing import Any, List, Union
+import yaml
+from dv_flow.mgr import PackageDef, TaskGraphBuilder, TaskSetRunner, task, TaskDataResult
+from dv_flow.mgr import TaskGraphBuilder, TaskGraphRunnerLocal, PackageDef
+from dv_flow.mgr.task_runner import TaskSetRunner
+from dv_flow.mgr.task_listener_log import TaskListenerLog
+from dv_flow.mgr.fileset import FileSet
+from pydantic import BaseModel
+from shutil import copytree
+
+def test_pkg_path_imp(tmpdir):
+    top_flow_dv = """
+package:
+    name: top
+
+    imports:
+    - subdir/flow.dv
+
+    tasks:
+    - name: top
+      uses: subpkg.top
+#      with:
+#        msg: "top.top"
+"""
+    subpkg_flow_dv = """
+package:
+    name: subpkg
+
+    tasks:
+    - name: top
+      uses: std.Message
+      with:
+        msg: "subpkg.top"
+"""
+
+    os.makedirs(os.path.join(tmpdir, "subdir"))
+
+    with open(os.path.join(tmpdir, "flow.dv"), "w") as f:
+        f.write(top_flow_dv)
+
+    with open(os.path.join(tmpdir, "subdir/flow.dv"), "w") as f:
+        f.write(subpkg_flow_dv)
+
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "flow.dv"))
+    print("pkg_def: %s" % str(pkg_def), flush=True)
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=os.path.join(tmpdir, "rundir"))
+    runner = TaskSetRunner(os.path.join(tmpdir, "rundir"))
+
+    task = builder.mkTaskGraph("top.top")
+    output = asyncio.run(runner.run(task))
+
+def test_local_name_collision(tmpdir):
+    top_flow_dv = """
+package:
+    name: top
+
+    imports:
+    - subdir/flow.dv
+
+    tasks:
+    - name: subtask
+      uses: std.Message
+      with:
+        msg: "top.subtask"
+    - name: top
+      needs: [subtask, subpkg.top]
+      uses: std.Message
+      with:
+        msg: "top.top"
+"""
+    subpkg_flow_dv = """
+package:
+    name: subpkg
+
+    tasks:
+    - name: subtask
+      uses: std.Message
+      with:
+        msg: "subpkg.subtask"
+    - name: top
+      uses: std.Message
+      needs: [subtask]
+      with:
+        msg: "subpkg.top"
+"""
+
+    os.makedirs(os.path.join(tmpdir, "subdir"))
+
+    with open(os.path.join(tmpdir, "flow.dv"), "w") as f:
+        f.write(top_flow_dv)
+
+    with open(os.path.join(tmpdir, "subdir/flow.dv"), "w") as f:
+        f.write(subpkg_flow_dv)
+
+    pkg_def = PackageDef.load(os.path.join(tmpdir, "flow.dv"))
+    print("pkg_def: %s" % str(pkg_def), flush=True)
+    builder = TaskGraphBuilder(
+        root_pkg=pkg_def,
+        rundir=os.path.join(tmpdir, "rundir"))
+    runner = TaskSetRunner(os.path.join(tmpdir, "rundir"))
+
+    task = builder.mkTaskGraph("top.top")
+    output = asyncio.run(runner.run(task))