fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-30 19:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Collapse the whole subject wire in materialized folds

Browse Source
This commit is contained in:
Dennis Kobert
2026-08-22 19:11:48 +00:00
parent 7b993c5de6
commit a2918887f6
3 changed files with 21 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
node-graph/libraries/core-types/src/record.rs
+5 -7
View File
@@ -325,9 +325,8 @@ pub struct LayoutMeta {
/// The depth change the node applies: `0` for elementwise and flip nodes, /// The depth change the node applies: `0` for elementwise and flip nodes,
/// `+1` for a creator, `-1` for a reducer. /// `+1` for a creator, `-1` for a reducer.
pub level_delta: i8, pub level_delta: i8,
/// The materialized subject a reducer folds, as `(input, levels)`: the /// The materialized subject a reducer folds, as `(input, levels)`. The fold
/// output keeps the subject's levels above the folded ones, so the depth /// consumes the whole subject wire, so only the node's own levels remain.
/// derives from its layout even though it contributes no fields.
pub folded: Option<(u8, u8)>, pub folded: Option<(u8, u8)>,
} }
@@ -375,10 +374,9 @@ impl LayoutMeta {
} }
.without(&self.removes); .without(&self.removes);
let depth = match self.folded { let depth = match self.folded {
Some((input, levels)) => { // A fold consumes the whole subject wire (a deeper wire folds its
let subject = inputs[input as usize].expect("layout fold folded input has no layout"); // total flat span), so only the node's own levels remain.
(subject.depth.saturating_sub(levels) as i8 + self.level_delta).max(0) as u8 Some(_) => self.level_delta.max(0) as u8,
}
None => (base.depth as i8 + self.level_delta).max(0) as u8, None => (base.depth as i8 + self.level_delta).max(0) as u8,
}; };
let element = match &self.element { let element = match &self.element {
node-graph/node-macro/src/codegen.rs
+8 -42
View File
@@ -779,13 +779,6 @@ pub(crate) fn generate_node_impl(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
.iter() .iter()
.any(|bound| matches!(bound, TypeParamBound::Trait(trait_bound) if trait_bound.path.segments.last().is_some_and(|segment| segment.ident == "ExtractArena"))) .any(|bound| matches!(bound, TypeParamBound::Trait(trait_bound) if trait_bound.path.segments.last().is_some_and(|segment| segment.ident == "ExtractArena")))
}); });
let ctx_extracts_index = ctx_param.is_some_and(|ctx_param| {
ctx_param
.bounds
.iter()
.any(|bound| matches!(bound, TypeParamBound::Trait(trait_bound) if trait_bound.path.segments.last().is_some_and(|segment| segment.ident == "ExtractIndex")))
});
let derives = ctx_param.is_some_and(|ctx_param| { let derives = ctx_param.is_some_and(|ctx_param| {
ctx_param.bounds.iter().any(|bound| match bound { ctx_param.bounds.iter().any(|bound| match bound {
TypeParamBound::Trait(trait_bound) => trait_bound.path.segments.last().is_some_and(|segment| segment.ident == "DeriveCtx"), TypeParamBound::Trait(trait_bound) => trait_bound.path.segments.last().is_some_and(|segment| segment.ident == "DeriveCtx"),
@@ -793,9 +786,6 @@ pub(crate) fn generate_node_impl(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
}) })
}); });
let derive_routing = derives && routing_generic.is_some(); let derive_routing = derives && routing_generic.is_some();
// A reducer's materialized subject folds the flat span of the consumer's
// lane when the wire is deeper than the fold; the ctx supplies the lane.
let derived_materialized = |index: usize| ctx_extracts_index && node.inputs[index].subject && ir::materialized_levels(&node, index) > 0 && node.output.shape.depth == 0;
let ctx_generic = match ctx_bounds.is_empty() { let ctx_generic = match ctx_bounds.is_empty() {
true => quote!(#ctx_ident), true => quote!(#ctx_ident),
@@ -1128,40 +1118,24 @@ pub(crate) fn generate_node_impl(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
// record/flip tail), so it does not bind here. // record/flip tail), so it does not bind here.
ValueBinding::Carrier => quote!(), ValueBinding::Carrier => quote!(),
ValueBinding::Materialized => { ValueBinding::Materialized => {
let levels = ir::materialized_levels(&node, index); let fn_name = &parsed.fn_name;
let non_exact = fail(quote!(#core_types::gpoll::GraphError::new("reduce over a non-exact extent"))); let non_exact = fail(quote!(#core_types::gpoll::GraphError::new(::std::concat!("reduce over a non-exact extent in ", ::std::stringify!(#fn_name)))));
let batch_error = fail(quote!(__error)); let batch_error = fail(quote!(__error));
let batch_failed = fail(quote!(#core_types::gpoll::GraphError::new("reduce batch failed"))); let batch_failed = fail(quote!(#core_types::gpoll::GraphError::new("reduce batch failed")));
// A reducer's subject on a deeper wire folds the flat span of // A fold consumes the whole subject wire: a deeper wire's
// the consumer's lane: the flat convention encodes the outer // total flat span, sized under the evaluation context, so a
// coordinate in the range, not the chain. The span offset // fold inside a pushed level covers that copy's span.
// needs the exact inner count, so a lower bound only drains
// when the fold covers the whole wire.
let deeper = match derived_materialized(index) {
true => quote!(#core_types::node::Node::<#ctx_ident>::layout(&self.#name).depth > #levels),
false => quote!(false),
};
let start = match derived_materialized(index) {
true => quote! {
match __deeper {
true => #core_types::context::ExtractIndex::innermost_index(__input) * __count as u64,
false => 0,
}
},
false => quote!(0),
};
quote! { quote! {
let __arena = #core_types::context::ExtractArena::arena(__input); let __arena = #core_types::context::ExtractArena::arena(__input);
let __deeper = #deeper; let __sized = match #core_types::node::Node::extent(&self.#name, __input, #core_types::gpoll::Level::Total) {
let __sized = match #core_types::node::Node::extent(&self.#name, __input, #core_types::gpoll::Level::Below(#levels)) {
#core_types::gpoll::GPoll::Final(#core_types::gpoll::Extent::Exactly(__count)) => ::core::result::Result::Ok(__count), #core_types::gpoll::GPoll::Final(#core_types::gpoll::Extent::Exactly(__count)) => ::core::result::Result::Ok(__count),
#core_types::gpoll::GPoll::Final(#core_types::gpoll::Extent::AtLeast(__bound)) if !__deeper => ::core::result::Result::Err(__bound), #core_types::gpoll::GPoll::Final(#core_types::gpoll::Extent::AtLeast(__bound)) => ::core::result::Result::Err(__bound),
#core_types::gpoll::GPoll::Pending => #pending, #core_types::gpoll::GPoll::Pending => #pending,
_ => #non_exact, _ => #non_exact,
}; };
let __batch = match __sized { let __batch = match __sized {
::core::result::Result::Ok(__count) => { ::core::result::Result::Ok(__count) => {
let __start: u64 = #start; let __start: u64 = 0;
match #core_types::record::materialize_batch(&self.#name, __input, __start..__start + __count as u64, __arena) { match #core_types::record::materialize_batch(&self.#name, __input, __start..__start + __count as u64, __arena) {
#core_types::node::BatchStatus::Lent(__batch, ..) => __batch, #core_types::node::BatchStatus::Lent(__batch, ..) => __batch,
#core_types::node::BatchStatus::Filled(__batch, ..) => __batch.into_shared(), #core_types::node::BatchStatus::Filled(__batch, ..) => __batch.into_shared(),
@@ -1433,14 +1407,6 @@ pub(crate) fn generate_node_impl(crate_ident: &CrateIdent, parsed: &ParsedNodeFn
#path(self, __input, __level) #path(self, __input, __level)
} }
} }
} else if let Some((subject_index, folded_levels)) = ir::folded_subject(&node).filter(|_| node.output.shape.depth == 0) {
// A reducer's output keeps the subject's levels above the folded ones.
let name = &regular_fields[subject_index as usize].pat_ident.ident;
quote! {
fn extent_at(&self, __input: &#ctx_ident, __level: u8) -> #core_types::gpoll::GPoll<#core_types::gpoll::Extent> {
#core_types::node::Node::extent_at(&self.#name, __input, __level + #folded_levels)
}
}
} else if let Some(subject_index) = ir::forwarded_subject(&node).filter(|_| node.output.shape.depth == 0) { } else if let Some(subject_index) = ir::forwarded_subject(&node).filter(|_| node.output.shape.depth == 0) {
// A level-preserving passthrough forwards its subject's extents, // A level-preserving passthrough forwards its subject's extents,
// through the same per-binding query forms the explicit surface uses. // through the same per-binding query forms the explicit surface uses.
node-graph/nodes/gcore/src/record.rs
+8 -14
View File
@@ -1445,7 +1445,7 @@ mod tests {
} }
#[test] #[test]
fn partial_fold_keeps_the_outer_level() { fn fold_collapses_a_deeper_wire() {
let arena = Arena::new(1 << 16).unwrap(); let arena = Arena::new(1 << 16).unwrap();
let generations = []; let generations = [];
let scope = scope_fixture(&generations, &arena); let scope = scope_fixture(&generations, &arena);
@@ -1457,7 +1457,7 @@ mod tests {
let (reverse_edge, reverse_layout) = lifted_value(false); let (reverse_edge, reverse_layout) = lifted_value(false);
reserve_for(&[&base, &leveled_content, &count_layout, &reverse_layout]); reserve_for(&[&base, &leveled_content, &count_layout, &reverse_layout]);
// Element = the outer copy, so each outer row folds to a distinct sum. // Element = the outer copy, so the total fold sums across both copies.
let content = install( let content = install(
RepeatOpacityNode::new(IndexSourceNode { layout: base.clone() }, ValueNode(3u32), &base), RepeatOpacityNode::new(IndexSourceNode { layout: base.clone() }, ValueNode(3u32), &base),
repeat_opacity_layout_meta(), repeat_opacity_layout_meta(),
@@ -1482,18 +1482,12 @@ mod tests {
let node = install(SumNode::new(nested, &two_level), sum_layout_meta(), &[Some(&two_level)]); let node = install(SumNode::new(nested, &two_level), sum_layout_meta(), &[Some(&two_level)]);
let out = Node::<ContextImpl>::layout(&node).clone(); let out = Node::<ContextImpl>::layout(&node).clone();
assert_eq!(out.depth, 1, "the fold keeps the subject's outer level"); assert_eq!(out.depth, 0, "the fold consumes the whole wire");
assert_eq!(node.extent_at(&ctx, 0), GPoll::Final(Extent::Exactly(2)), "the outer extent shifts down"); let GPoll::Final(value) = node.eval(&ctx) else {
panic!("expected a final record");
let head = ctx.index_head(); };
for (lane, expected) in [(0u64, 0.), (1, 3.)] { // Two copies of three lanes, each lane the copy index: 0 * 3 + 1 * 3.
let mark = stack::sp(); assert_eq!(unsafe { out.rec(&value).element::<f64>() }, 3.);
let GPoll::Final(value) = node.eval(&ctx.promoted(&head, lane)) else {
panic!("expected a final record");
};
assert_eq!(unsafe { out.rec(&value).element::<f64>() }, expected, "row {lane}");
unsafe { stack::rewind(mark) };
}
} }
#[test] #[test]