archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Functions: support cycles in lazy-function graph

Browse Source 
Lazy-function graphs are now evaluated properly even if they contain
cycles. Note that cycles are only ok if there is no data dependency cycle.
For example, a node might output something that is fed back into itself.
As long as the output can be computed without the input that it feeds into,
everything is ok.

The code that builds the graph is responsible for making sure that there
are no actual data dependencies.
This commit is contained in:
Jacques Lucke
2022-12-29 16:38:18 +01:00
parent 47b9ed2409
commit b6ca942e47
5 changed files with 126 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/functions/intern/lazy_function_graph_executor.cc
View File

@@ -762,8 +762,10 @@ class Executor {
input_state.was_ready_for_execution = true;
continue;
}
if (input_state.usage == ValueUsage::Used) {
return;
if (!fn.allow_missing_requested_inputs()) {
if (input_state.usage == ValueUsage::Used) {
return;
}
}
}
@@ -1031,7 +1033,10 @@ class Executor {
if (input_state.usage == ValueUsage::Used) {
node_state.missing_required_inputs -= 1;
if (node_state.missing_required_inputs == 0) {
if (node_state.missing_required_inputs == 0 ||
(locked_node.node.is_function() && static_cast<const FunctionNode &>(locked_node.node)
.function()
.allow_missing_requested_inputs())) {
this->schedule_node(locked_node, current_task);
}
}
@@ -1248,6 +1253,9 @@ GraphExecutor::GraphExecutor(const Graph &graph,
logger_(logger),
side_effect_provider_(side_effect_provider)
{
/* The graph executor can handle partial execution when there are still missing inputs. */
allow_missing_requested_inputs_ = true;
for (const OutputSocket *socket : graph_inputs_) {
BLI_assert(socket->node().is_dummy());
inputs_.append({"In", socket->type(), ValueUsage::Maybe});