Skip to content

Commit 8c0be70

Browse files
committed
Use new function for finding array variable names
1 parent 70a7ab2 commit 8c0be70

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

cubed/diagnostics/dash.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
from cubed.storage.zarr import LazyZarrArray
1919
from cubed.utils import (
2020
chunk_memory,
21+
extract_array_names_from_stack_summaries,
2122
extract_stack_summaries,
2223
memory_repr,
2324
normalize_chunks,
@@ -234,21 +235,18 @@ def plan_to_cytoscape(
234235
)
235236

236237
# do an initial pass to extract array variable names from stack summaries
237-
array_display_names = {}
238+
stacks = []
238239
for _, d in dag.nodes(data=True):
239240
if "stack_summaries" in d:
240241
stack_summaries = d["stack_summaries"]
241-
first_cubed_i = min(
242-
i for i, s in enumerate(stack_summaries) if s.is_cubed()
243-
)
244-
caller_summary = stack_summaries[first_cubed_i - 1]
245-
array_display_names.update(caller_summary.array_names_to_variable_names)
242+
stacks.append(stack_summaries)
246243
# add current stack info
247-
frame = inspect.currentframe().f_back # go back one in the stack
244+
# TODO: following isn't right yet
245+
# go back one in the stack to the caller of 'compute'
246+
frame = inspect.currentframe().f_back
248247
stack_summaries = extract_stack_summaries(frame, limit=10)
249-
first_cubed_i = min(i for i, s in enumerate(stack_summaries) if s.is_cubed())
250-
caller_summary = stack_summaries[first_cubed_i - 1]
251-
array_display_names.update(caller_summary.array_names_to_variable_names)
248+
stacks.append(stack_summaries)
249+
array_display_names = extract_array_names_from_stack_summaries(stacks)
252250

253251
elements = []
254252

0 commit comments

Comments
 (0)