onnx-ignore-output-shapes on by default

CHANGELOG.md

@@ -1,3 +1,6 @@
+# Unreleased
+* ONNX ignoring output shapes is now the default
+
 # 0.20.18 - 2023-08-30
 * [intel] fix in AVX512F matrix vector product
 * [tflite] alpha, embryonic support. some convolutional models working.

api/py/tests/mobilenet_onnx_test.py

@@ -77,7 +77,6 @@ def test_inference_model():
 def test_set_output_names_on_inference_model():
     model = tract.onnx().model_for_path("./mobilenetv2-7.onnx")
     model.set_input_fact(0, "B,3,224,224,f32")
-    model.set_output_fact(0, None)
     model.analyse()
     model.set_output_names(["mobilenetv20_output_pred_fwd"])
     assert str(model.output_fact(0)) == "B,1000,1,1,F32"
@@ -100,7 +99,6 @@ def test_set_output_names():
 def test_concretize():
     model = tract.onnx().model_for_path("./mobilenetv2-7.onnx")
     model.set_input_fact(0, "B,3,224,224,f32")
-    model.set_output_fact(0, None)
     model.analyse()
     typed = model.into_typed().into_decluttered()
     assert str(typed.input_fact(0)) == "B,3,224,224,F32"
@@ -112,7 +110,6 @@ def test_concretize():
 def test_pulse():
     model = tract.onnx().model_for_path("./mobilenetv2-7.onnx")
     model.set_input_fact(0, "B,3,224,224,f32")
-    model.set_output_fact(0, None)
     model.analyse()
     typed = model.into_typed().into_decluttered()
     assert str(typed.input_fact(0)) == "B,3,224,224,F32"
@@ -128,7 +125,6 @@ def test_pulse():
 def test_half():
     model = tract.onnx().model_for_path("./mobilenetv2-7.onnx")
     model.set_input_fact(0, "1,3,224,224,f32")
-    model.set_output_fact(0, None)
     model.analyse()
     typed = model.into_typed().into_decluttered()
     typed.half()
@@ -138,7 +134,6 @@ def test_half():
 def test_typed_model_to_nnef_and_back():
     model = tract.onnx().model_for_path("./mobilenetv2-7.onnx")
     model.set_input_fact(0, "B,3,224,224,f32")
-    model.set_output_fact(0, None)
     model.analyse()
     typed = model.into_typed()
     with tempfile.TemporaryDirectory() as tmpdirname:

api/tests/mobilenet/mod.rs

@@ -150,7 +150,6 @@ fn test_concretize() -> anyhow::Result<()> {
     ensure_models()?;
     let mut model = onnx()?.model_for_path("mobilenetv2-7.onnx")?;
     model.set_input_fact(0, "B,3,224,224,f32")?;
-    model.set_output_fact(0, None)?;
     model.analyse()?;
     let mut typed = model.into_typed()?.into_decluttered()?;
     assert_eq!(typed.input_fact(0)?.to_string(), "B,3,224,224,F32");
@@ -166,7 +165,6 @@ fn test_pulse() -> anyhow::Result<()> {
     ensure_models()?;
     let mut model = onnx()?.model_for_path("mobilenetv2-7.onnx")?;
     model.set_input_fact(0, "B,3,224,224,f32")?;
-    model.set_output_fact(0, None)?;
     model.analyse()?;
     let mut typed = model.into_typed()?.into_decluttered()?;
     assert_eq!(typed.input_fact(0)?.to_string(), "B,3,224,224,F32");
@@ -186,7 +184,6 @@ fn test_half() -> anyhow::Result<()> {
     ensure_models()?;
     let mut model = onnx()?.model_for_path("mobilenetv2-7.onnx")?;
     model.set_input_fact(0, "B,3,224,224,f32")?;
-    model.set_output_fact(0, None)?;
     model.analyse()?;
     let mut typed = model.into_typed()?.into_decluttered()?;
     typed.half()?;
@@ -200,7 +197,6 @@ fn test_typed_model_to_nnef_and_back() -> anyhow::Result<()> {
     ensure_models()?;
     let mut model = onnx()?.model_for_path("mobilenetv2-7.onnx")?;
     model.set_input_fact(0, "B,3,224,224,f32")?;
-    model.set_output_fact(0, None)?;
     model.analyse()?;
     let typed = model.into_typed()?;
     let dir = tempfile::tempdir()?;

examples/keras-tract-tf2/src/main.rs

@@ -5,8 +5,6 @@ fn main() -> TractResult<()> {
     let model = tract_onnx::onnx()
     // load the model
     .model_for_path("example.onnx")?
-    // kill over-spcified output fact in ONNX
-    .with_output_fact(0, Default::default())?
     // optimize graph
     .into_optimized()?
     // make the model runnable and fix its inputs and outputs

onnx/src/model.rs

@@ -180,7 +180,7 @@ impl<'a> ParsingContext<'a> {
         let mut outputs = vec![];
         for output in graph.output.iter() {
             let mut fact = InferenceFact::default();
-            if !self.framework.ignore_output_shapes {
+            if self.framework.use_output_shapes {
                 if let Some(f) = output.r#type.as_ref().and_then(|t| t.value.as_ref()) {
                     let pb::type_proto::Value::TensorType(f) = f;
                     fact = translate_inference_fact(&ctx, f)?
@@ -222,7 +222,7 @@ impl OnnxOpRegister {
 #[derive(Clone, Default)]
 pub struct Onnx {
     pub op_register: OnnxOpRegister,
-    pub ignore_output_shapes: bool,
+    pub use_output_shapes: bool,
     pub ignore_output_types: bool,
 }
 
@@ -263,7 +263,7 @@ impl Onnx {
     }
 
     pub fn with_ignore_output_shapes(self, ignore: bool) -> Onnx {
-        Self { ignore_output_shapes: ignore, ..self }
+        Self { use_output_shapes: !ignore, ..self }
     }
 
     pub fn with_ignore_output_types(self, ignore: bool) -> Onnx {