Skip to content
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

Add BinEinsum to suite-unit #1630

Merged
merged 9 commits into from
Jan 31, 2025
Merged

Add BinEinsum to suite-unit #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
006f453
first proptest implem for matmul
LouisChourakiSonos Jan 16, 2025
c95a346
ignore some configurations for metal conv and einsum tests
LouisChourakiSonos Jan 29, 2025
da8a3c1
Removed broken edge cases ma agement handled by arbitrary
LouisChourakiSonos Jan 29, 2025
c13ab41
Limit inputs to 8 for Nnef tests
LouisChourakiSonos Jan 29, 2025
b0c6c01
no trivial exes for nnef and tf tests
LouisChourakiSonos Jan 30, 2025
c563972
force 1 iter axis for tflite
LouisChourakiSonos Jan 30, 2025
28fccf2
force dim <= 4 for tflite
LouisChourakiSonos Jan 30, 2025
d1af7c7
properly handle dimension limits
LouisChourakiSonos Jan 30, 2025
1e76405
renamed axes and add back support for unicas constant
LouisChourakiSonos Jan 30, 2025
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
8 changes: 6 additions & 2 deletions core/src/ops/einsum/as_matmul.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,12 @@ fn einsum_rules(
let op = match ensure_mkn_axes(op, model, node).context("Figuring out m, k and n axes")? {
AxesOrPatch::Annotated(op) => op,
AxesOrPatch::Patch(p) => return Ok(Some(p)),
AxesOrPatch::NotAMatMul(axis) => {
bail!("{} is not a matmul because of axis {}", op.axes, axis.repr)
AxesOrPatch::NotAMatMul(axes) => {
bail!(
"{} is not a matmul because of axis {}",
op.axes,
axes.iter().map(|a| a.repr).join(", ")
)
}
};
let prefix: String = op
Expand Down
8 changes: 6 additions & 2 deletions core/src/ops/einsum/optimize.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use crate::ops::nn::{Reduce, Reducer};
pub enum AxesOrPatch<'a> {
Annotated(EinSumAnnotatedAsMatMul<'a>),
Patch(TypedModelPatch),
NotAMatMul(&'a Axis),
NotAMatMul(Vec<&'a Axis>),
}

pub struct EinSumAnnotatedAsMatMul<'a> {
Expand Down Expand Up @@ -69,6 +69,7 @@ pub(crate) fn optimize(
{
return Ok(None);
}

let annotated = match ensure_mkn_axes(op, model, node)? {
AxesOrPatch::Annotated(op) => op,
AxesOrPatch::Patch(p) => return Ok(Some(p)),
Expand Down Expand Up @@ -114,6 +115,7 @@ pub(crate) fn ensure_mkn_axes<'a>(
let Some(k_axis) = k_axis else {
return Ok(AxesOrPatch::Patch(inject_k_axis(op, model, node)?));
};

let m_axis = op
.axes
.iter_all_axes()
Expand All @@ -126,13 +128,15 @@ pub(crate) fn ensure_mkn_axes<'a>(
let Some(m_axis) = m_axis else {
return Ok(AxesOrPatch::Patch(inject_m_or_n_axis(op, model, node, false, &[k_axis])?));
};

let n_axis = op
.axes
.iter_all_axes()
.filter(|a| {
(a.inputs[0].len() == 0 || input_shapes[0][a.inputs[0][0]].is_one())
&& a.inputs[1].len() == 1
&& a.outputs[0].len() == 1
&& *a != m_axis
})
.max_by_key(|a| output_shape[a.outputs[0][0]].as_i64().unwrap_or(i64::MAX));
let Some(n_axis) = n_axis else {
Expand All @@ -152,7 +156,7 @@ pub(crate) fn ensure_mkn_axes<'a>(
axis.inputs[1].first().map(|pos| &input_shapes[1][*pos]).unwrap_or(&one) != &one;
let in_out = axis.outputs[0].first().map(|pos| &output_shape[*pos]).unwrap_or(&one) != &one;
if (in_left ^ in_right) && !in_out {
return Ok(AxesOrPatch::NotAMatMul(axis));
return Ok(AxesOrPatch::NotAMatMul(vec![axis]));
}
}
let m = input_shapes[0][m_axis.inputs[0][0]].clone();
Expand Down
Loading
Loading