dv-flow-mgr 0.0.1.13711518075a1__py3-none-any.whl → 0.0.1.13711946395a1__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.
- dv_flow/mgr/pkg_rgy.py +6 -0
- dv_flow/mgr/task_graph_builder.py +11 -1
- {dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/METADATA +1 -1
- {dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/RECORD +8 -8
- {dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/LICENSE +0 -0
- {dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/WHEEL +0 -0
- {dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/entry_points.txt +0 -0
- {dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/top_level.txt +0 -0
dv_flow/mgr/pkg_rgy.py
CHANGED
@@ -122,6 +122,12 @@ class PkgRgy(object):
|
|
122
122
|
# for pkg in self._load_pkg_list():
|
123
123
|
# self._pkgs[pkg.name] = pkg
|
124
124
|
|
125
|
+
def copy(self):
|
126
|
+
ret = PkgRgy()
|
127
|
+
ret._pkgpath = self._pkgpath.copy()
|
128
|
+
ret._pkg_m = self._pkg_m.copy()
|
129
|
+
return ret
|
130
|
+
|
125
131
|
@classmethod
|
126
132
|
def inst(cls):
|
127
133
|
if cls._inst is None:
|
@@ -43,7 +43,7 @@ class TaskGraphBuilder(object):
|
|
43
43
|
|
44
44
|
def __post_init__(self):
|
45
45
|
if self.pkg_rgy is None:
|
46
|
-
self.pkg_rgy = PkgRgy.inst()
|
46
|
+
self.pkg_rgy = PkgRgy.inst().copy()
|
47
47
|
|
48
48
|
self._logger = logging.getLogger(type(self).__name__)
|
49
49
|
self._logger.debug("TaskGraphBuilder: root_pkg: %s" % str(self.root_pkg))
|
@@ -51,6 +51,7 @@ class TaskGraphBuilder(object):
|
|
51
51
|
if self.root_pkg is not None:
|
52
52
|
|
53
53
|
# Register package definitions found during loading
|
54
|
+
self._logger.debug("Packages: %s" % str(self.root_pkg))
|
54
55
|
for subpkg in self.root_pkg.subpkg_m.values():
|
55
56
|
self._logger.debug("Registering package %s" % subpkg.name)
|
56
57
|
self.pkg_rgy.registerPackage(subpkg)
|
@@ -110,6 +111,8 @@ class TaskGraphBuilder(object):
|
|
110
111
|
needs = []
|
111
112
|
|
112
113
|
for need_def in ctor_t.getNeeds():
|
114
|
+
# Resolve the full name of the need
|
115
|
+
need_fullname = self._resolveNeedRef(need_def)
|
113
116
|
if not need_def in self._task_m.keys():
|
114
117
|
need_t = self._mkTaskGraph(need_def, rundir)
|
115
118
|
self._task_m[need_def] = need_t
|
@@ -134,6 +137,13 @@ class TaskGraphBuilder(object):
|
|
134
137
|
|
135
138
|
return task
|
136
139
|
|
140
|
+
def _resolveNeedRef(self, need_def) -> str:
|
141
|
+
if need_def.find(".") == -1:
|
142
|
+
# Need is a local task. Prefix to avoid ambiguity
|
143
|
+
return self._pkg_s[-1].name + "." + need_def
|
144
|
+
else:
|
145
|
+
return need_def
|
146
|
+
|
137
147
|
def getPackage(self, spec : PackageSpec) -> Package:
|
138
148
|
# Obtain the active package definition
|
139
149
|
self._logger.debug("--> getPackage: %s len: %d" % (spec.name, len(self._pkg_spec_s)))
|
{dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/RECORD
RENAMED
@@ -13,13 +13,13 @@ dv_flow/mgr/param.py,sha256=3BY-ucig6JRw73FhjyJQL-vpd57qhAzixgZ8I5FoUpw,553
|
|
13
13
|
dv_flow/mgr/param_def.py,sha256=gLua-EQiY8V2CFX-2svLRIlrs8PEeGh4-EPtn4a2Mng,712
|
14
14
|
dv_flow/mgr/param_ref_eval.py,sha256=U8QhDf1n_9bLnExdc1oQamq5-pOUXrFalOX4oyR9UoM,1138
|
15
15
|
dv_flow/mgr/parsetab.py,sha256=I-p3nC60t9jiNtPhKyl_sE92SiP96zJLnNdydcLy33g,3780
|
16
|
-
dv_flow/mgr/pkg_rgy.py,sha256=
|
16
|
+
dv_flow/mgr/pkg_rgy.py,sha256=sCMNBTEWAAz1a0AnyeFm097RiVdjmo1yFRqdgC3TA-U,4890
|
17
17
|
dv_flow/mgr/task.py,sha256=kLQSvnVwj9ROIDtxq8lLu-4mJizTxOqvUeogmgN6QAA,5976
|
18
18
|
dv_flow/mgr/task_ctor.py,sha256=hlfl-UVvyjzLFN6D0Oel9eBs0xUQPqCX7gQ0uEHoL7o,1382
|
19
19
|
dv_flow/mgr/task_data.py,sha256=F0X-e0IHTh06Z0F67TWIUPKuJYf6JPzZyMPrDzOJvK0,11409
|
20
20
|
dv_flow/mgr/task_def.py,sha256=Wmh78mQLAiHXlpD2KCvFxTWtnjjwgct8fEm8gelCg1c,1987
|
21
21
|
dv_flow/mgr/task_exec_data.py,sha256=aT__kmVmNxqnS_GbTRS1vrYgKiv8cH-HUSmRb6YYKsI,640
|
22
|
-
dv_flow/mgr/task_graph_builder.py,sha256=
|
22
|
+
dv_flow/mgr/task_graph_builder.py,sha256=aiHCtNSDnzDxTylIKn482Ee58T074SVjpxWnr7xk45U,8755
|
23
23
|
dv_flow/mgr/task_graph_runner.py,sha256=jUGI49QvxUCfQoKQDDk2psbeapIcCg72qNOW1JipHzM,2182
|
24
24
|
dv_flow/mgr/task_graph_runner_local.py,sha256=OrydPwtQ8E7hYWvSXx0h7lI3nfUNFyklULhsyMwz9dA,4687
|
25
25
|
dv_flow/mgr/task_impl_data.py,sha256=bFPijoKrh9x7fZN2DsvRJp0UHo-gGM0VjtDQISyfhFk,321
|
@@ -39,9 +39,9 @@ dv_flow/mgr/std/fileset.py,sha256=69cgah6jmRNGmFaLZKpMUaxVSaQ5DxtrqshhQwXhO54,29
|
|
39
39
|
dv_flow/mgr/std/flow.dv,sha256=DpDTrRBfbIt4cJKLHqk_l6_nPkeFDKLVa5Ic4FZodNM,1587
|
40
40
|
dv_flow/mgr/std/message.py,sha256=T8Ye44784rD6CT2qIAP5SD7sKPdAlGMFimc4IaPCxxE,200
|
41
41
|
dv_flow/mgr/std/task_null.py,sha256=UKwUnqwFPBY8BO44ZAPcgehQB59kHZFa1qyZc1TwUqE,196
|
42
|
-
dv_flow_mgr-0.0.1.
|
43
|
-
dv_flow_mgr-0.0.1.
|
44
|
-
dv_flow_mgr-0.0.1.
|
45
|
-
dv_flow_mgr-0.0.1.
|
46
|
-
dv_flow_mgr-0.0.1.
|
47
|
-
dv_flow_mgr-0.0.1.
|
42
|
+
dv_flow_mgr-0.0.1.13711946395a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
|
43
|
+
dv_flow_mgr-0.0.1.13711946395a1.dist-info/METADATA,sha256=M6JigWeeKUC2TjPf0_rCn9U9nf16TYwFpTmBQfQ7LXg,13314
|
44
|
+
dv_flow_mgr-0.0.1.13711946395a1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
|
45
|
+
dv_flow_mgr-0.0.1.13711946395a1.dist-info/entry_points.txt,sha256=1roy8wAFM48LabOvr6jiOw0MUs-qE8X3Vf8YykPazxk,50
|
46
|
+
dv_flow_mgr-0.0.1.13711946395a1.dist-info/top_level.txt,sha256=amfVTkggzYPtWwLqNmRukfz1Buu0pGS2SrYBBLhXm04,8
|
47
|
+
dv_flow_mgr-0.0.1.13711946395a1.dist-info/RECORD,,
|
{dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/LICENSE
RENAMED
File without changes
|
{dv_flow_mgr-0.0.1.13711518075a1.dist-info → dv_flow_mgr-0.0.1.13711946395a1.dist-info}/WHEEL
RENAMED
File without changes
|
File without changes
|
File without changes
|