dv-flow-mgr 0.0.2.14180132375a1__py3-none-any.whl → 0.0.2.14182043984a1__py3-none-any.whl

dv_flow/mgr/package_def.py

@@ -541,7 +541,10 @@ class PackageDef(BaseModel):
         # - Directory path
 
         if os.path.isfile(os.path.join(pkg._basedir, spec)):
-            PackageDef._loadFragmentFile(pkg, spec, file_s)
+            PackageDef._loadFragmentFile(
+                pkg, 
+                os.path.join(pkg._basedir, spec), 
+                file_s)
         elif os.path.isdir(os.path.join(pkg._basedir, spec)):
             PackageDef._loadFragmentDir(pkg, os.path.join(pkg._basedir, spec), file_s)
         else:
@@ -564,7 +567,7 @@ class PackageDef(BaseModel):
         with open(file, "r") as fp:
             doc = yaml.load(fp, Loader=yaml.FullLoader)
             PackageDef._log.debug("doc: %s" % str(doc))
-            if "fragment" in doc.keys():
+            if doc is not None and "fragment" in doc.keys():
                 # Merge the package definition
                 frag = FragmentDef(**(doc["fragment"]))
                 frag._basedir = os.path.dirname(file)

dv_flow/mgr/task_graph_builder.py

@@ -193,6 +193,13 @@ class TaskGraphBuilder(object):
                 task = self._compound_task_ctxt_s[-1].task_m[name]
         if task is None and name in self._task_m.keys():
             task = self._task_m[name]
+
+        if task is None:
+            # Go search type definitions
+
+            # Check the current package
+            if len(self._pkg_s) > 0 and name in self._pkg_s[-1].task_m.keys():
+                task = self._pkg_s[-1].task_m[name]
         
         return task
 
@@ -274,6 +281,9 @@ class TaskGraphBuilder(object):
         self._pkg_spec_s.pop()
 
         return task
+    
+    def findTaskDef(self, name):
+        pass
 
     def _resolveNeedRef(self, need_def) -> str:
         if need_def.find(".") == -1:
@@ -418,4 +428,7 @@ class TaskGraphBuilder(object):
         self._logger.debug("--> getTaskCtor %s" % spec.name)
         return ctor
     
+    def error(self, msg):
+        pass
+    
 

dv_flow/mgr/task_node_ctor_compound.py

@@ -69,10 +69,23 @@ class TaskNodeCtorCompound(TaskNodeCtor):
     def _buildSubGraph(self, builder, node):
         nodes = []
 
+        # First, build out all tasks so they're available
+        tasks_defs = []
         for t in self.tasks:
+            # Initially, 
+            sn = t.mkTaskNode(
+                builder=builder, 
+                params=t.mkTaskParams(),
+                name=t.name,
+                needs=[])
+            nodes.append(sn)
+            builder.addTask(t.name, sn)
+            tasks_defs.append(sn, t)
+
+        for t,td in tasks_defs:
             # Need to get the parent name
             needs = []
-            for n in t.needs:
+            for n in td.needs:
                 # 'n' is the dependency as specified by the user
                 # Need to perform a search
                 # - Look locally inside the compound task (pkg.compound.name)
@@ -94,13 +107,8 @@ class TaskNodeCtorCompound(TaskNodeCtor):
                     task.name, t.name
                 ))
                 needs.append(task)
-            sn = t.mkTaskNode(
-                builder=builder, 
-                params=t.mkTaskParams(),
-                name=t.name,
-                needs=needs)
-            nodes.append(sn)
-            builder.addTask(t.name, sn)
+            t.needs.extends(needs)
+
         in_t = builder.findTask("in")
 
         

{dv_flow_mgr-0.0.2.14180132375a1.dist-info → dv_flow_mgr-0.0.2.14182043984a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dv-flow-mgr
-Version: 0.0.2.14180132375a1
+Version: 0.0.2.14182043984a1
 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.14180132375a1.dist-info → dv_flow_mgr-0.0.2.14182043984a1.dist-info}/RECORD

@@ -8,7 +8,7 @@ dv_flow/mgr/fragment_def.py,sha256=AHx3ITbiNbGCzlDk5FM8Iimm0GJnWXDDRAoRC1b41jM,1
 dv_flow/mgr/listener_list.py,sha256=BfqvEO2AyJvyc4ClU-hPgDPqWSlqvSdG-yaFEHvUrMc,272
 dv_flow/mgr/out,sha256=d8GGBi3J43fhdLBlnsUbzBfRe0TD0QTP3nOTz54l2bI,200
 dv_flow/mgr/package.py,sha256=9FhOu1hKYKzlD88zehwrI6KAcs1E7TbXDnq4v54dqDQ,1701
-dv_flow/mgr/package_def.py,sha256=18y29oi_vQc4Jzl7v7iHjRo22eUQbndPxa1bucrZX8E,21343
+dv_flow/mgr/package_def.py,sha256=uwyIEoRjkhvWsnYsQ-Q6tcZWobKRjRh4fJ9GQG4qsYE,21442
 dv_flow/mgr/package_import_spec.py,sha256=aZMpnS9a5NFY76_pYXEuO3-Mkc_xFzy73fdrUe_54Dc,1760
 dv_flow/mgr/param.py,sha256=kkxMRGf6mPjSZJsjgLKH2vJL62Sn0ZESvjBLkEYOp20,1386
 dv_flow/mgr/param_def.py,sha256=mkAw3DanIxcVWRYeh9lUAfUMkpqDFly_Ku_iobr4ix8,1745
@@ -17,13 +17,13 @@ dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
 dv_flow/mgr/pkg_rgy.py,sha256=d1nIjRm3ymMNJT-yiMDxCS6bFisTPvLMqh5VrfsHVKM,5404
 dv_flow/mgr/task_data.py,sha256=lN7Iq8YTitEMGG4rZqYQi6Ri2HuPgBQ5oGQbW-63T8c,12436
 dv_flow/mgr/task_def.py,sha256=ClCPFLlpT70Nxcr4xxBJBtdRxwFHq5YUtEDNVCiqFtE,4559
-dv_flow/mgr/task_graph_builder.py,sha256=ST8EseeO8JZUTUSU44txxaUVKlXEiTOPbvB_UVrlraU,15463
+dv_flow/mgr/task_graph_builder.py,sha256=b97detx0zawWy5dsVq2ZUjU710V2fmYkMxT04q9sSTs,15797
 dv_flow/mgr/task_graph_dot_writer.py,sha256=GxqiYwQJbFgUQdnPCS9vpIYmYFbSXwnXCSbGmjbxC3M,2418
 dv_flow/mgr/task_listener_log.py,sha256=hrJEjSRXXoovDTcD1Cmhi3Spzw7uEJ-WP6tv6JUaa6s,4060
 dv_flow/mgr/task_node.py,sha256=JXq2QimCZKxfhhkdhM-HKk4JbxpIlpW65xUJ0hVlQc0,4981
 dv_flow/mgr/task_node_compound.py,sha256=mNu4nf9hVqu2698ue5fpE3FeAOkvJH0Ke2W9V0G3-As,2975
 dv_flow/mgr/task_node_ctor.py,sha256=COFGvm5PR2B92H3uW1yhDIUCmppo9U4IfOcv_Jrsreo,3952
-dv_flow/mgr/task_node_ctor_compound.py,sha256=pINhIyiYBQANTQmauCDjbLuU4Vj9vC_YN2e2kbaKzpc,4734
+dv_flow/mgr/task_node_ctor_compound.py,sha256=6SSulKk20PTLAgcwGqGear-jZBHhSYg_XypTYzX8iAc,4946
 dv_flow/mgr/task_node_ctor_compound_proxy.py,sha256=D8x54nD8Pd-2-_mr1syhqVeSFfIVf100ldi3bdzmSfI,2073
 dv_flow/mgr/task_node_ctor_def_base.py,sha256=_8QQHKDkONio_ve0Z409yxC0AMO8ocNBPDjRiNED1FI,1503
 dv_flow/mgr/task_node_ctor_proxy.py,sha256=ViOFJ64JM4-CGFZNl89BghFuKSQ66kZVqSj4v2PA6VA,1906
@@ -51,9 +51,9 @@ dv_flow/mgr/util/__main__.py,sha256=F0LXpCDpYTPalSo0dc1h_qZkip5v1AZYYh-vcYbh5s0,
 dv_flow/mgr/util/util.py,sha256=yg9oTPRiO87mkCSOQpOtlG9vyKPQzY3qp4OJkEMbWyY,1443
 dv_flow/mgr/util/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dv_flow/mgr/util/cmds/cmd_schema.py,sha256=lrEI-Jwb8j4I4yYOn9hq7_7NYbK8leVxLesrHyEWm-E,1879
-dv_flow_mgr-0.0.2.14180132375a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-dv_flow_mgr-0.0.2.14180132375a1.dist-info/METADATA,sha256=QLOGDOXZd4thm8uoINL9_a6fsgnl9jM4nXojB_ArY9E,13336
-dv_flow_mgr-0.0.2.14180132375a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-dv_flow_mgr-0.0.2.14180132375a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
-dv_flow_mgr-0.0.2.14180132375a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
-dv_flow_mgr-0.0.2.14180132375a1.dist-info/RECORD,,
+dv_flow_mgr-0.0.2.14182043984a1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+dv_flow_mgr-0.0.2.14182043984a1.dist-info/METADATA,sha256=4vV1cbCnI2zL7Ew0v6YRd6syDPb5naXkUa07s0wSoFE,13336
+dv_flow_mgr-0.0.2.14182043984a1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+dv_flow_mgr-0.0.2.14182043984a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
+dv_flow_mgr-0.0.2.14182043984a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
+dv_flow_mgr-0.0.2.14182043984a1.dist-info/RECORD,,