Skip to content

Repository navigation

style: restore cargo fmt on main #1567

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

Merged
justinchuby merged 1 commit into from
Aug 20, 2026
Merged

style: restore cargo fmt on main #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions crates/onnx-runtime-ep-cuda/src/kernels/global_reduction.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,10 @@ mod l2_faithful_tests {
eprintln!("skipping faithful L2-normalize parity test: CUDA runtime unavailable");
return;
};
if runtime.require_nvrtc_half_headers("LpNormalization").is_err() {
if runtime
.require_nvrtc_half_headers("LpNormalization")
.is_err()
{
eprintln!("skipping faithful L2-normalize parity test: bf16 headers unavailable");
return;
}
Expand All @@ -545,7 +548,9 @@ mod l2_faithful_tests {
let got = run_kernel(&runtime, true, groups, axis_length, &data);
let mut expected = Vec::with_capacity(data.len());
for g in 0..groups {
expected.extend(chain_reference(&data[g * axis_length..(g + 1) * axis_length]));
expected.extend(chain_reference(
&data[g * axis_length..(g + 1) * axis_length],
));
}
assert_eq!(
got, expected,
Expand All @@ -561,7 +566,10 @@ mod l2_faithful_tests {
eprintln!("skipping faithful-vs-fp32 divergence test: CUDA runtime unavailable");
return;
};
if runtime.require_nvrtc_half_headers("LpNormalization").is_err() {
if runtime
.require_nvrtc_half_headers("LpNormalization")
.is_err()
{
eprintln!("skipping faithful-vs-fp32 divergence test: bf16 headers unavailable");
return;
}
Expand Down
30 changes: 16 additions & 14 deletions crates/onnx-runtime-ep-cuda/src/optimizer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,9 @@ impl OptimizationPass for CudaL2NormalizeFusion {
lpnorm.inputs = vec![Some(x)];
lpnorm.attributes.clear();
lpnorm.attributes.insert("p".into(), Attribute::Int(2));
lpnorm.attributes.insert("axis".into(), Attribute::Int(axis));
lpnorm
.attributes
.insert("axis".into(), Attribute::Int(axis));
// Private marker: route to the byte-faithful L2-normalize kernel that
// reproduces the exported chain's intermediate rounding, so greedy
// decode stays token-identical to the unfused graph.
Expand Down Expand Up @@ -4153,13 +4155,9 @@ mod tests {
let nrm = graph.create_named_value("nrm", dtype, vec![Dim::Static(1), Dim::Static(1)]);
let output = value(&mut graph, "output", dtype, width);
graph.add_input(x);
let mut rss = Node::new(
NodeId(0),
"ReduceSumSquare",
vec![Some(x)],
vec![sq],
);
rss.attributes.insert("axes".into(), Attribute::Ints(vec![-1]));
let mut rss = Node::new(NodeId(0), "ReduceSumSquare", vec![Some(x)], vec![sq]);
rss.attributes
.insert("axes".into(), Attribute::Ints(vec![-1]));
rss.attributes.insert("keepdims".into(), Attribute::Int(1));
graph.insert_node(rss);
graph.insert_node(Node::new(NodeId(0), "Sqrt", vec![Some(sq)], vec![nrm]));
Expand All @@ -4183,7 +4181,11 @@ mod tests {
.unwrap();

// ReduceSumSquare and Sqrt are gone; a single LpNormalization remains.
assert_eq!(graph.num_nodes(), 1, "only the fused LpNormalization remains");
assert_eq!(
graph.num_nodes(),
1,
"only the fused LpNormalization remains"
);
assert!(
graph
.nodes
Expand All @@ -4196,7 +4198,10 @@ mod tests {
.values()
.find(|n| n.op_type == "LpNormalization")
.expect("Div must be rewritten to LpNormalization");
assert!(lp.is_default_domain(), "LpNormalization stays default domain");
assert!(
lp.is_default_domain(),
"LpNormalization stays default domain"
);
assert_eq!(lp.inputs, vec![Some(x)], "reads the pre-norm activation x");
assert_eq!(lp.outputs, vec![output], "keeps the Div output value");
assert_eq!(
Expand Down Expand Up @@ -4261,10 +4266,7 @@ mod tests {
.run(&mut graph, &PassContext::new())
.unwrap();
assert!(
graph
.nodes
.values()
.any(|n| n.op_type == "ReduceSumSquare")
graph.nodes.values().any(|n| n.op_type == "ReduceSumSquare")
&& graph.nodes.values().any(|n| n.op_type == "Sqrt")
&& graph.nodes.values().any(|n| n.op_type == "Div"),
"an escaping norm must leave the ReduceSumSquare/Sqrt/Div chain intact"
Expand Down
Loading