dv-flow-mgr 0.0.1.12941975786a1__py3-none-any.whl → 0.0.1.12942385741a1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -58,7 +58,7 @@ class PackageDef(BaseModel):
58
58
  def mkPackage(self, session, params : Dict[str,Any] = None) -> 'Package':
59
59
  ret = Package(self.name)
60
60
 
61
- session.push_package(ret)
61
+ session.push_package(ret, add=True)
62
62
 
63
63
  tasks_m : Dict[str,str,TaskCtor]= {}
64
64
 
@@ -252,9 +252,6 @@ class PackageDef(BaseModel):
252
252
  # else:
253
253
  # self._pkg_def_m[PackageSpec(pkg.name)] = pkg
254
254
 
255
- print("pkg: %s" % str(pkg))
256
-
257
- print("fragments: %s" % str(pkg.fragments))
258
255
  for spec in pkg.fragments:
259
256
  PackageDef._loadFragmentSpec(pkg, spec, file_s)
260
257
 
@@ -48,8 +48,10 @@ class TaskGraphBuilder(object):
48
48
  self._pkg_spec_s.pop()
49
49
  self._pkg_m[PackageSpec(self.root_pkg.name)] = pkg
50
50
 
51
- def push_package(self, pkg : Package):
51
+ def push_package(self, pkg : Package, add=False):
52
52
  self._pkg_s.append(pkg)
53
+ if add:
54
+ self._pkg_m[PackageSpec(pkg.name, pkg.params)] = pkg
53
55
 
54
56
  def pop_package(self, pkg : Package):
55
57
  self._pkg_s.pop()
@@ -136,10 +138,6 @@ class TaskGraphBuilder(object):
136
138
  pkg = self._pkg_s[-1]
137
139
  if spec in self._pkg_m.keys():
138
140
  pkg = self._pkg_m[spec]
139
- elif self.pkg_rgy.hasPackage(spec.name):
140
- pkg_def = self.pkg_rgy.getPackage(spec.name)
141
- pkg = pkg_def.mkPackage(self)
142
- self._pkg_m[spec] = pkg
143
141
  else:
144
142
  pkg = None
145
143
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: dv-flow-mgr
3
- Version: 0.0.1.12941975786a1
3
+ Version: 0.0.1.12942385741a1
4
4
  Summary: DV Flow Manager is a build system for silicon design
5
5
  Author-email: Matthew Ballance <matt.ballance@gmail.com>
6
6
  License: Apache License
@@ -3,13 +3,13 @@ dv_flow/mgr/__main__.py,sha256=big-RSuqbx7P48_8rzaZKX5YW3B2US1i0mRH_TfoeIs,1340
3
3
  dv_flow/mgr/fileset.py,sha256=FNvC5sU2ArxJ0OO3v8dXTv8zX-bZ5t0a0ljne0fQQ1o,1150
4
4
  dv_flow/mgr/fragment_def.py,sha256=p5i6ONtBWlDHTBFsduu3Z36_76Bn8PCIylp_xoZ7jfQ,1552
5
5
  dv_flow/mgr/package.py,sha256=7G_ZQaTHin_mcwQu1PRsGmqfKAbdu9IC5HeLXtPgBDc,1342
6
- dv_flow/mgr/package_def.py,sha256=3X0lrbU_SCNhxF9wFTpfQcmD1AbOv4XhnA-5U0IPouk,11431
6
+ dv_flow/mgr/package_def.py,sha256=BWErUHH82dKTT82-dt-Q_Pls8faH9co5EZJLayL5eqo,11352
7
7
  dv_flow/mgr/package_import_spec.py,sha256=ah3r15v5Jdub2poc3sgi6Uar1L3oGoYsCPPNiOHV-a4,1760
8
8
  dv_flow/mgr/pkg_rgy.py,sha256=ej8VyWH8BWdDNVqk3cSJgQq4h3bW1rgj6uCxUr7gfH8,4384
9
9
  dv_flow/mgr/task.py,sha256=ewJ7bCFWqwVuzHZZsX2LDZfzXWVFfFlH8yFyn-xxIVg,5043
10
10
  dv_flow/mgr/task_data.py,sha256=-6Dqa3oUI7RJc1Js2SRSnhxNTcASkamXFYMN6UiknZQ,10376
11
11
  dv_flow/mgr/task_def.py,sha256=96hSwqJo0MazJ1VcLhovYRmNCplsNLt47AumtyjSddU,1690
12
- dv_flow/mgr/task_graph_builder.py,sha256=KRPf-Mr_n7rXqovylo4qlkkj6LBcjz23pA73koh_Mzs,8054
12
+ dv_flow/mgr/task_graph_builder.py,sha256=NKGRPCSkUd2Dri-qEN4-UWVHRfPprzeC8Lz8joGtM3c,7962
13
13
  dv_flow/mgr/task_graph_runner.py,sha256=NwNYcOJ952lPMLwIIlYE9CoDdedqvcw2fWHYUsKFXuU,2164
14
14
  dv_flow/mgr/task_graph_runner_local.py,sha256=UTBV1AKanLns99CSYtEQQ3EEkgo1hM8XsHpc8E5jkIg,4646
15
15
  dv_flow/mgr/task_memento.py,sha256=C7VTQpBhDEoYuDmE6YTM-6TLMLnqHp6Y0Vat1aTgtCs,1096
@@ -20,9 +20,9 @@ dv_flow/mgr/std/fileset.py,sha256=0eBp0VIkxYbIYAt0YJg0m-6nUbPuzGkaVBtxpius7Cg,23
20
20
  dv_flow/mgr/std/flow.dv,sha256=pSpzrPPEu_L8DHccGfArxsKYgUfyQidShZc0ShgGtsY,500
21
21
  dv_flow/mgr/std/message.py,sha256=BPTHnEMD4tBufQ9LvsS9Sa_0xjaJATbBpwqosWslvVA,193
22
22
  dv_flow/mgr/std/task_null.py,sha256=UEJ3fIoIMYWVsagiQC7GHD23UES7WoH4wtq94b4tcs4,265
23
- dv_flow_mgr-0.0.1.12941975786a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
24
- dv_flow_mgr-0.0.1.12941975786a1.dist-info/METADATA,sha256=CmKzPLZndBpS5JUk0Sg28f_yKMPuCnbhRtzyoMP3PGI,13276
25
- dv_flow_mgr-0.0.1.12941975786a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
26
- dv_flow_mgr-0.0.1.12941975786a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
27
- dv_flow_mgr-0.0.1.12941975786a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
28
- dv_flow_mgr-0.0.1.12941975786a1.dist-info/RECORD,,
23
+ dv_flow_mgr-0.0.1.12942385741a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
24
+ dv_flow_mgr-0.0.1.12942385741a1.dist-info/METADATA,sha256=wtjCBdxmdymUebFBaN_yL_iBKOubJifCR4e6S5KH7MI,13276
25
+ dv_flow_mgr-0.0.1.12942385741a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
26
+ dv_flow_mgr-0.0.1.12942385741a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
27
+ dv_flow_mgr-0.0.1.12942385741a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
28
+ dv_flow_mgr-0.0.1.12942385741a1.dist-info/RECORD,,