Geometry Nodes: make evaluation and logging system aware of zones #109029

Jacques Lucke · 2023-06-15T19:50:53+02:00

Jacques Lucke commented

2023-06-15 19:50:53 +02:00

This refactors how a geometry nodes node tree is converted to a lazy-function graph. Previously, all nodes were inserted into a single graph. This was fine because every node was evaluated at most once per node group evaluation. However, loops (#108896) break this assumption since now nodes may be evaluated multiple times and thus a single flat graph does not work anymore.

Now, a separate lazy-function is build for every zone which gives us much more flexibility for what can happen in a zone. Right now, the change only applies to simulation zones since that's the only kind of zone we have. Technically, those zones could be inlined, but turning them into a separate lazy-function also does not hurt and makes it possible to test this refactor without implementing loops first.

The most tricky part here is to just link everything up correctly, especially with respect to deterministic anonymous attribute lifetimes. Fortunately, correctness can be checked visually by looking at the generated graphs.

The logging/viewer system also had to be refactored a bit, because now there can be multiple different ComputeContext in a single node tree. Each zone is in a separate ComputeContext. To make it work, the ViewerPath system now explicitly supports zones and drawing code will look up the right logger for showing inspection data.

This refactors how a geometry nodes node tree is converted to a lazy-function graph. Previously, all nodes were inserted into a single graph. This was fine because every node was evaluated at most once per node group evaluation. However, loops (#108896) break this assumption since now nodes may be evaluated multiple times and thus a single flat graph does not work anymore. Now, a separate lazy-function is build for every zone which gives us much more flexibility for what can happen in a zone. Right now, the change only applies to simulation zones since that's the only kind of zone we have. Technically, those zones could be inlined, but turning them into a separate lazy-function also does not hurt and makes it possible to test this refactor without implementing loops first. The most tricky part here is to just link everything up correctly, especially with respect to deterministic anonymous attribute lifetimes. Fortunately, correctness can be checked visually by looking at the generated graphs. The logging/viewer system also had to be refactored a bit, because now there can be multiple different `ComputeContext` in a single node tree. Each zone is in a separate `ComputeContext`. To make it work, the `ViewerPath` system now explicitly supports zones and drawing code will look up the right logger for showing inspection data.

Jacques Lucke added 67 commits 2023-06-15 19:51:07 +02:00

b84c911040 initial zone border link detection

02b0ccb1ec make zone data structure more well defined

e49a536e2c determine zone build order

4033653c29 cleanup

f4e7ca4eae create initial graphs for zones

6ba6667aa8 find root nodes and zones

2ec72a3307 add insert bnode params struct

44ce75c135 insert initial links in simulation zone

f74829fb52 cleanup

218810a87f cleanup

32cde3e863 improve naming

2b91426b2a improve naming

c70bff8943 initial root graph

f26c19e5bd add remaining links in root tree

47f80f4e04 link up links in zone

81be5a2b2f add default inputs

282dc94ccd cleanup

6ceac8adea cleanup

ff7e5c3be6 cleanup

1a78d27ffe cleanup

3e1daca053 cleanup

092f062520 extract functions

f802a23775 cleanup

bb000d7982 cleanup index handling

ffe4a98055 add usage sockets

e5c5ddce6c Merge branch 'main' into zone-evaluation

033c2525a8 add debug info

86d4c1c6cd add simulation socket usages

612cf3b07c build nodes and usages in one pass

db1b94a37c compute socket usages in zone

dd87985ff6 Merge branch 'main' into zone-evaluation

aa99892da9 Merge branch 'main' into zone-evaluation

3589063e20 cleanup

5ad32eb887 add per zone attribute propagation map

5f2985ba8f initial anonymous attributes in zone

b810c4d27f progress

81cc7f32c1 Merge branch 'main' into zone-evaluation

e16ddd9ce3 fix

826b77fc5b cleanup

225e12a2e4 fix multi-input border links

26536c7854 use per zone socket usage inputs set

10e2f45f4f cleanup

cf3e9f2b3d improve debug names

59d104887e improve usage sockets of border links

ae11b29f53 improve anonymous attributes in zones

7634e75a30 support anonymous attribute propagation outside of zones

0c73439d20 add attribute propagation input node

42396d93c1 fix

bf7cdea79b fix

6d7eb3d7c0 cleanup

eed6a9047c cleanup

73bf74efcb cleanup naming

7e8040888c cleanup naming

ad35bd8479 progress

22f58e98c4 fixes

f01697c6f1 fixes

78ce713e85 cleanup

ea68eed28b cleanup

0f5a6790b4 extract function to insert nodes and zones

3e9131a5b6 cleanup

5d82bade96 extract function

c373d942ba cleanup

f1e388000a cleanup

d8a61c1f38 cleanup

1b5bed1d91 cleanup

955469442b improve comment

buildbot/vexp-code-patch-coordinator Build done. Details

5ad52c0a75 cleanup

Jacques Lucke commented

2023-06-15 19:58:00 +02:00

@blender-bot build

Jacques Lucke added 1 commit 2023-06-15 20:06:05 +02:00

625903ffad fix drawing when dragging link

Jacques Lucke added 10 commits 2023-06-16 12:51:51 +02:00

acef84fb8a Merge branch 'main' into zone-evaluation

28764f0101 cleanup

ee510d117d Merge branch 'main' into zone-evaluation

ff9477d7a1 simplify code using resource scope

198a572c5e cleanup

32545cc954 cleanup naming

1286ba66ab add comments

ebd6297ace cleanup

49364e4aff reorder functions

948759ff5c cleanup

Jacques Lucke added 4 commits 2023-06-18 12:11:45 +02:00

742c184734 Merge branch 'main' into zone-evaluation

de5f467e73 add extra lazy function for simulation zone

b901e15628 add simulation zone compute context

0c88ef3ae3 Merge branch 'main' into zone-evaluation

Jacques Lucke added 9 commits 2023-06-19 19:51:21 +02:00

7a38442c44 progress

8e8186ce99 Merge branch 'zone-evaluation' into zone-viewer-path

4bee0b2d64 add zones in viewer path

ddbb68462e progress

5954c4ff35 cleanup

a133410406 prepare per zone log

3baf7cdc0e find zones

72fe7ab72a add logger in simulation zone

eca4290430 progress

Jacques Lucke added 1 commit 2023-06-19 20:12:42 +02:00

711741ee13 Merge branch 'main' into zone-evaluation

Jacques Lucke added 1 commit 2023-06-19 20:20:48 +02:00

buildbot/vexp-code-patch-coordinator Build done. Details

1bbb4029ec support logging on simulation input/output node

Jacques Lucke changed title from ~~WIP: Geometry Nodes: build a separate lazy-function for each zone~~ to Geometry Nodes: make evaluation and logging system aware of zones

2023-06-19 20:21:07 +02:00

Jacques Lucke commented

2023-06-19 20:24:19 +02:00

@blender-bot build