dv-flow-mgr 0.0.2.14163613545a1__tar.gz → 0.0.2.14180123344a1__tar.gz

{dv_flow_mgr-0.0.2.14163613545a1 → dv_flow_mgr-0.0.2.14180123344a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.2.14163613545a1
+Version: 0.0.2.14180123344a1
 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.2.14163613545a1 → dv_flow_mgr-0.0.2.14180123344a1}/pyproject.toml

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

{dv_flow_mgr-0.0.2.14163613545a1 → dv_flow_mgr-0.0.2.14180123344a1}/src/dv_flow/mgr/__main__.py

@@ -55,6 +55,9 @@ def get_parser():
     run_parser.add_argument("-j",
                         help="Specifies degree of parallelism. Uses all cores by default",
                         type=int, default=-1)
+    run_parser.add_argument("-c", "--clean",
+                            action="store_true",
+                            help="Cleans the rundir before running")
     run_parser.set_defaults(func=CmdRun())
 
     show_parser = subparsers.add_parser('show', 

{dv_flow_mgr-0.0.2.14163613545a1 → dv_flow_mgr-0.0.2.14180123344a1}/src/dv_flow/mgr/cmds/cmd_run.py

@@ -77,6 +77,12 @@ class CmdRun(object):
         # TODO: allow user to specify run root -- maybe relative to some fixed directory?
         rundir = os.path.join(pkg._basedir, "rundir")
 
+        if args.clean:
+            print("Note: Cleaning rundir %s" % rundir)
+            if os.path.exists(rundir):
+                os.rmdir(rundir)
+            os.makedirs(rundir)
+
         builder = TaskGraphBuilder(root_pkg=pkg, rundir=rundir)
         runner = TaskSetRunner(rundir)
 

{dv_flow_mgr-0.0.2.14163613545a1 → dv_flow_mgr-0.0.2.14180123344a1}/src/dv_flow/mgr/task_def.py

@@ -49,13 +49,31 @@ class PassthroughE(enum.Enum):
     All = "all"
     Unused = "unused"
 
-
 class StrategyDef(BaseModel):
     chain: Union[bool, None] = dc.Field(default=None)
     matrix : Union[Dict[str,List[Any]],None] = dc.Field(
         default=None,
         description="Matrix of parameter values to explore")
 
+class TaskExecDef(BaseModel):
+    pytask : Union[str, None] = dc.Field(
+        default=None,
+        description="Python method to execute to implement this task")
+    pydep  : Union[str, None] = dc.Field(
+        default=None,
+        description="Python method to check up-to-date status for this task")
+
+class TasksBuilder(BaseModel):
+    # TODO: control how much data this task is provided?
+    pydef : Union[str, None] = dc.Field(
+        default=None,
+        description="Python method to build the subgraph")
+
+class Tasks(BaseModel):
+    tasks: Union[List['TaskDef'], TasksBuilder] = dc.Field(
+        default_factory=list,
+        description="Sub-tasks")
+
 class TaskDef(BaseModel):
     """Holds definition information (ie the YAML view) for a task"""
     name : str = dc.Field(
@@ -73,7 +91,7 @@ class TaskDef(BaseModel):
         description="Python method to execute to implement this task")
     strategy : StrategyDef = dc.Field(
         default=None)
-    tasks: List['TaskDef'] = dc.Field(
+    tasks: Union[List['TaskDef'], TasksBuilder] = dc.Field(
         default_factory=list,
         description="Sub-tasks")
     desc : str = dc.Field(

{dv_flow_mgr-0.0.2.14163613545a1 → dv_flow_mgr-0.0.2.14180123344a1}/src/dv_flow/mgr/task_node_ctor_compound.py

@@ -73,13 +73,23 @@ class TaskNodeCtorCompound(TaskNodeCtor):
             # Need to get the parent name
             needs = []
             for n in t.needs:
-                need_name = "%s.%s" % (builder.package().name, n)
-                task = builder.findTask(n)
-                if task is None:
+                # 'n' is the dependency as specified by the user
+                # Need to perform a search
+                # - Look locally inside the compound task (pkg.compound.name)
+                # - Look for the fully-qualified task name
+                # - Look for the task name in the package
+
+                names = []
+                for pref in (builder.get_name_prefix((), "", builder.package().name)):
+                    need_name = n if pref == "" else ("%s.%s" % (pref, n))
+                    names.append(need_name)
                     task = builder.findTask(need_name)
 
+                    if task is not None:
+                        break
+
                 if task is None:
-                    raise Exception("Failed to find task %s (%s)" % (n, need_name))
+                    raise Exception("Failed to find task %s (searched %s)" % (n, str(names)))
                 self._log.debug("Add %s as dependency of %s" % (
                     task.name, t.name
                 ))

{dv_flow_mgr-0.0.2.14163613545a1 → dv_flow_mgr-0.0.2.14180123344a1}/src/dv_flow_mgr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.2.14163613545a1
+Version: 0.0.2.14180123344a1
 Summary: DV Flow Manager is a build system for silicon design
 Author-email: Matthew Ballance <matt.ballance@gmail.com>
 License:                                  Apache License