|
18 | 18 | from cubed.storage.zarr import LazyZarrArray |
19 | 19 | from cubed.utils import ( |
20 | 20 | chunk_memory, |
| 21 | + extract_array_names_from_stack_summaries, |
21 | 22 | extract_stack_summaries, |
22 | 23 | memory_repr, |
23 | 24 | normalize_chunks, |
@@ -234,21 +235,18 @@ def plan_to_cytoscape( |
234 | 235 | ) |
235 | 236 |
|
236 | 237 | # do an initial pass to extract array variable names from stack summaries |
237 | | - array_display_names = {} |
| 238 | + stacks = [] |
238 | 239 | for _, d in dag.nodes(data=True): |
239 | 240 | if "stack_summaries" in d: |
240 | 241 | 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) |
246 | 243 | # 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 |
248 | 247 | 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) |
252 | 250 |
|
253 | 251 | elements = [] |
254 | 252 |
|
|
0 commit comments