Deduplicate Const when wireing new node in typed graph + fixes in NNEF

sonos · Dec 11, 2024 · c0abc05 · c0abc05
1 parent e78057f
commit c0abc05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/core/src/model/typed.rs b/core/src/model/typed.rs
@@ -48,6 +48,12 @@ impl SpecialOps<TypedFact, Box<dyn TypedOp>> for TypedModel {
     ) -> TractResult<TVec<OutletId>> {
         let op = op.into();
         let name = name.into();
+        if let Some(konst) = op.downcast_ref::<Const>() {
+            // only if no opaque fact is present.
+            if konst.1.is_none() {
+                return Ok(tvec![self.add_const(name, konst.0.clone())?]);
+            }
+        }
         if self.nodes.iter().any(|n| n.name == name) {
             bail!("Duplicate node name: {name}");
         }

diff --git a/nnef/src/deser.rs b/nnef/src/deser.rs
@@ -664,16 +664,9 @@ impl CoerceFrom<Value> for (Arc<Tensor>, DatumType) {
 impl CoerceFrom<Value> for OutletId {
     fn coerce(builder: &mut ModelBuilder, from: &Value) -> TractResult<Self> {
         match from {
-            Value::Tensor(t) => {
-                Ok(builder.wire_as_outlets(tract_core::ops::konst::Const::new(t.clone()), &[])?[0])
-            }
-            Value::Scalar(f) => {
-                Ok(builder
-                    .wire_as_outlets(tract_core::ops::konst::Const::new(rctensor0(*f)), &[])?[0])
-            }
-            Value::Dim(i) => Ok(builder
-                .wire_as_outlets(tract_core::ops::konst::Const::new(rctensor0(i.clone())), &[])?
-                [0]),
+            Value::Tensor(t) => builder.add_const(t.clone()),
+            Value::Scalar(f) => builder.add_const(rctensor0(*f)),
+            Value::Dim(i) => builder.add_const(rctensor0(i.clone())),
             Value::Wire(outlet) => Ok(*outlet),
             Value::Tuple(tuple) if tuple.len() == 1 => OutletId::coerce(builder, &tuple[0]),
             Value::Array(inputs) => {
@@ -689,13 +682,8 @@ impl CoerceFrom<Value> for OutletId {
                     .wire_as_outlets(tract_core::ops::array::TypedConcat::new(0), &outlets)
                     .map(|o| o[0])
             }
-            Value::String(s) => Ok(builder
-                .wire_as_outlets(tract_core::ops::konst::Const::new(rctensor0(s.clone())), &[])?
-                [0]),
-            Value::Bool(b) => {
-                Ok(builder
-                    .wire_as_outlets(tract_core::ops::konst::Const::new(rctensor0(*b)), &[])?[0])
-            }
+            Value::String(s) => builder.add_const(rctensor0(s.clone())),
+            Value::Bool(b) => builder.add_const(rctensor0(*b)),
             _ => bail!("Can not build an outletid from {:?}", from),
         }
     }