Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions crates/onnx-runtime-session/src/executor/geometry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,8 @@ fn mask_binding_feeds_capacity_form_attention_impl(
// `q_seq == 1`, where the window saturates to the same position
// regardless of width), so a consumed `Shape` does not disqualify.
if node.op_type == "Shape" && shape_policy == ShapeConsumptionPolicy::Disqualify {
let shape_output_consumed = node
.outputs
.iter()
.any(|out| consumers.contains_key(out));
let shape_output_consumed =
node.outputs.iter().any(|out| consumers.contains_key(out));
if shape_output_consumed {
return false;
}
Expand Down
59 changes: 50 additions & 9 deletions crates/onnx-runtime-session/src/executor/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2401,15 +2401,40 @@ fn v2lite_symbolic_mask_graph() -> (Graph, ValueId, SymbolId, Node) {
let mask = graph.create_named_value("attention_mask", DataType::Int64, m2(batch, seq));
graph.add_input(mask);
let cumsum = graph.create_named_value("cumsum", DataType::Int64, m2(batch, seq));
graph.insert_node(Node::new(NodeId(0), "CumSum", vec![Some(mask)], vec![cumsum]));
graph.insert_node(Node::new(
NodeId(0),
"CumSum",
vec![Some(mask)],
vec![cumsum],
));
let unsq0 = graph.create_named_value("unsq0", DataType::Int64, m3(batch, seq));
graph.insert_node(Node::new(NodeId(1), "Unsqueeze", vec![Some(cumsum)], vec![unsq0]));
graph.insert_node(Node::new(
NodeId(1),
"Unsqueeze",
vec![Some(cumsum)],
vec![unsq0],
));
let ge = graph.create_named_value("ge", DataType::Bool, m3(batch, seq));
graph.insert_node(Node::new(NodeId(2), "GreaterOrEqual", vec![Some(unsq0)], vec![ge]));
graph.insert_node(Node::new(
NodeId(2),
"GreaterOrEqual",
vec![Some(unsq0)],
vec![ge],
));
let unsq1 = graph.create_named_value("unsq1", DataType::Int64, m3(batch, seq));
graph.insert_node(Node::new(NodeId(3), "Unsqueeze", vec![Some(mask)], vec![unsq1]));
graph.insert_node(Node::new(
NodeId(3),
"Unsqueeze",
vec![Some(mask)],
vec![unsq1],
));
let padbool = graph.create_named_value("padbool", DataType::Bool, m3(batch, seq));
graph.insert_node(Node::new(NodeId(4), "Cast", vec![Some(unsq1)], vec![padbool]));
graph.insert_node(Node::new(
NodeId(4),
"Cast",
vec![Some(unsq1)],
vec![padbool],
));
let and = graph.create_named_value("and", DataType::Bool, m3(batch, seq));
graph.insert_node(Node::new(
NodeId(5),
Expand All @@ -2418,20 +2443,36 @@ fn v2lite_symbolic_mask_graph() -> (Graph, ValueId, SymbolId, Node) {
vec![and],
));
let where_o = graph.create_named_value("where", DataType::Float32, m3(batch, seq));
graph.insert_node(Node::new(NodeId(6), "Where", vec![Some(and)], vec![where_o]));
graph.insert_node(Node::new(
NodeId(6),
"Where",
vec![Some(and)],
vec![where_o],
));
let cast_o = graph.create_named_value("cast", DataType::Float32, m3(batch, seq));
graph.insert_node(Node::new(NodeId(7), "Cast", vec![Some(where_o)], vec![cast_o]));
graph.insert_node(Node::new(
NodeId(7),
"Cast",
vec![Some(where_o)],
vec![cast_o],
));
let bias = graph.create_named_value(
"mask_bias",
DataType::Float32,
vec![sym(batch), st(1), st(1), sym(seq)],
);
graph.insert_node(Node::new(NodeId(8), "Unsqueeze", vec![Some(cast_o)], vec![bias]));
graph.insert_node(Node::new(
NodeId(8),
"Unsqueeze",
vec![Some(cast_o)],
vec![bias],
));

// Capacity-form `Attention` consuming the additive bias (input 3) with past
// KV bindings at inputs 4/5.
let q = graph.create_named_value("q", DataType::Float32, vec![sym(batch), st(1), st(256)]);
let attn = graph.create_named_value("attn", DataType::Float32, vec![sym(batch), st(1), st(256)]);
let attn =
graph.create_named_value("attn", DataType::Float32, vec![sym(batch), st(1), st(256)]);
let node = capacity_form_attention(10, q, bias, attn);
graph.insert_node(node.clone());
graph.add_output(attn);
Expand Down
Loading