Skip to content

Commit 799c4ac

Browse files
authored
daskvine small fixes (#4079)
* use static methods consistenly * use node.key in get_result call
1 parent e657730 commit 799c4ac

File tree

1 file changed

+7
-7
lines changed
  • taskvine/src/bindings/python3/ndcctools/taskvine

1 file changed

+7
-7
lines changed

taskvine/src/bindings/python3/ndcctools/taskvine/dask_dag.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ def get_ready(self):
119119
if self.has_result(key) or cs:
120120
continue
121121
node = self._working_graph[key]
122-
if self.taskref(node):
122+
if DaskVineDag.taskref(node):
123123
rs.update(self.set_result(key, self.get_result(node.key)))
124-
elif self.symbolp(node):
124+
elif DaskVineDag.symbolp(node):
125125
rs.update(self.set_result(key, node))
126126
else:
127127
rs[key] = node
@@ -147,11 +147,11 @@ def set_result(self, key, value):
147147
continue
148148

149149
node = self._working_graph[p]
150-
if self.taskref(node):
150+
if DaskVineDag.taskref(node):
151151
rs.update(
152-
self.set_result(p, self.get_result(node))
152+
self.set_result(p, self.get_result(node.key))
153153
) # case e.g, "x": "y", and we just set the value of "y"
154-
elif self.symbolp(node):
154+
elif DaskVineDag.symbolp(node):
155155
rs.update(self.set_result(p, node))
156156
else:
157157
rs[p] = node
@@ -169,14 +169,14 @@ def set_result(self, key, value):
169169

170170
def _add_second_targets(self, key):
171171
v = self._working_graph[key]
172-
if self.taskref(v):
172+
if DaskVineDag.taskref(v):
173173
lst = [v]
174174
elif DaskVineDag.containerp(v):
175175
lst = v
176176
else:
177177
return
178178
for c in lst:
179-
if self.taskref(c):
179+
if DaskVineDag.taskref(c):
180180
self._targets.add(c.key)
181181
self._add_second_targets(c.key)
182182

0 commit comments

Comments
 (0)