more fixes around einsum and opaue facts

sonos · Aug 30, 2024 · 16f3383 · 16f3383
1 parent 30f2424
commit 16f3383
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/core/src/model/typed.rs b/core/src/model/typed.rs
@@ -184,12 +184,14 @@ impl TypedModel {
                     "Inconsistent model, output types mismatch. Op says: {:?}, node says: {:?}. {} with inputs {:?}. {}",
                     output_facts, node.outputs.iter().map(|o| &o.fact).collect::<Vec<_>>(), node, input_facts, node)
             }
+            /* this is not true for regularly packed values
             if let Some(k) = node.op_as::<Const>() {
                 ensure!(
                     !k.0.datum_type().is_opaque() || k.1.is_some(),
                     "Node {node} is missing an opaque fact"
                 );
             }
+            */
         }
         for node in &self.nodes {
             for (ix, output) in node.outputs.iter().enumerate() {

diff --git a/core/src/ops/einsum/eval.rs b/core/src/ops/einsum/eval.rs
@@ -30,13 +30,12 @@ pub fn eval_t<Acc: Datum + Zero + One>(
         .iter()
         .map(|t| {
             if t.datum_type() == Opaque::datum_type() {
-                dbg!(t);
-                todo!();
+                bail!("Unoptimized einsum execution with BlockQuantized input is not implemented.");
             } else {
-                t.shape()
+                Ok(t.shape())
             }
         })
-        .collect();
+        .collect::<TractResult<_>>()?;
     let output_shape = output_shape(expr, &shapes);
     let inputs: TVec<Cow<Tensor>> =
         inputs.iter().map(|t| t.cast_to::<Acc>()).collect::<TractResult<_>>()?;