Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rewrite evaluable loops using Loop base class #861

Merged
merged 10 commits into from
Mar 26, 2024
Merged

rewrite evaluable loops using Loop base class #861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a5cbef9
fill nested subgraphs with distinct bg colors
joostvanzwieten Mar 18, 2024
c224e54
add graph.TupleNode
joostvanzwieten Mar 8, 2024
0380125
replace Evaluable._node_tuple with TupleNode
joostvanzwieten Mar 8, 2024
5baa1db
repl ArrayFromTuple(_lower, _upper) w tuple attr
joostvanzwieten Mar 26, 2024
bc80de9
let parallel.fork test false when not forking
joostvanzwieten Mar 21, 2024
18be7c8
return IDSetView in Evaluable._loop_concat_deps
joostvanzwieten Mar 25, 2024
4f467dc
lower tolerance of unittest
joostvanzwieten Mar 26, 2024
cef1750
rewrite evaluable loops using Loop base class
joostvanzwieten Mar 8, 2024
3b8c820
remove shape[:-1] from LoopConcat constructor args
joostvanzwieten Mar 21, 2024
de07c59
make _dependencies_sans_invariants non-recursive
gertjanvanzwieten Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions nutils/_graph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def generate_graphviz_source(self, *, fill_color: Optional[GraphvizColorCallback
subgraph_children = _collect_subgraphs(self)
id_gen = map(str, itertools.count())
self._collect_graphviz_nodes_edges({}, id_gen, nodes, edges, None, fill_color)
return ''.join(itertools.chain(['digraph {bgcolor="darkgray";'], _generate_graphviz_subgraphs(subgraph_children, nodes, None, id_gen), edges, ['}']))
return ''.join(itertools.chain(['digraph {bgcolor="darkgray";'], _generate_graphviz_subgraphs(subgraph_children, nodes, None, id_gen, 0), edges, ['}']))

def export_graphviz(self, *, fill_color: Optional[GraphvizColorCallback] = None, dot_path: str = 'dot', image_type: str = 'svg') -> None:
src = self.generate_graphviz_source(fill_color=fill_color)
Expand Down Expand Up @@ -156,6 +156,19 @@ def walk(self, seen: MutableSet[Node[Metadata]]) -> Iterator[Node[Metadata]]:
yield from arg.walk(seen)


class TupleNode(RegularNode[Metadata]):

def __init__(self, items: Tuple[Node, ...], metadata: Metadata, subgraph: Optional[Subgraph] = None) -> None:
self.items = items
super().__init__(label='Tuple', args=items, kwargs={}, metadata=metadata, subgraph=subgraph)

def __len__(self) -> int:
return len(self.items)

def __getitem__(self, index: int) -> Node:
return self.items[index]


class DuplicatedLeafNode(Node[Metadata]):

def __init__(self, label: str, metadata: Metadata) -> None:
Expand Down Expand Up @@ -237,9 +250,9 @@ def _generate_asciitree_subgraphs(children: Mapping[Optional[Subgraph], Sequence
yield from _generate_asciitree_subgraphs(children, id_gen_map, child, bridge+('├ ' if i else '└ '), bridge+('│ ' if i else ' '))


def _generate_graphviz_subgraphs(children: Mapping[Optional[Subgraph], Sequence[Subgraph]], nodes: Mapping[Optional[Subgraph], Sequence[str]], subgraph: Optional[Subgraph], id_gen: Iterator[str]) -> Iterator[str]:
def _generate_graphviz_subgraphs(children: Mapping[Optional[Subgraph], Sequence[Subgraph]], nodes: Mapping[Optional[Subgraph], Sequence[str]], subgraph: Optional[Subgraph], id_gen: Iterator[str], depth: int) -> Iterator[str]:
for child in children[subgraph]:
yield 'subgraph cluster{} {{bgcolor="lightgray";color="none";'.format(next(id_gen))
yield from _generate_graphviz_subgraphs(children, nodes, child, id_gen)
yield 'subgraph cluster{} {{bgcolor="{}";color="none";'.format(next(id_gen), 'darkgray' if depth % 2 else 'lightgray')
yield from _generate_graphviz_subgraphs(children, nodes, child, id_gen, depth + 1)
yield '}'
yield from nodes.get(subgraph, ())
Loading
Loading