more fixs around nnef q

sonos · Dec 12, 2023 · 27061a9 · 27061a9
1 parent 285f44e
commit 27061a9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/nnef/src/ast.rs b/nnef/src/ast.rs
@@ -44,7 +44,7 @@ impl QuantFormat {
             QuantFormat::Linear { params, bits, signed } => match (bits, signed) {
                 (8, true) => DatumType::QI8(*params),
                 (8, false) => DatumType::QU8(*params),
-                (32, true) => DatumType::I32,
+                (32, true) => DatumType::QI32(*params),
                 (32, false) => DatumType::U32,
                 _ => todo!(),
             },

diff --git a/test-rt/suite-unit/src/conv_q.rs b/test-rt/suite-unit/src/conv_q.rs
@@ -1183,5 +1183,23 @@ pub fn suite() -> TractResult<TestSuite> {
             raw_output_dt: DatumType::I32,
         },
     );
+    let mut qp = qp_noop_i8();
+    qp[1] = tensor0(0.25f32);
+    qp[2] = tensor0(1i32);
+    qp[5] = tensor0(0.5f32);
+    suite.add(
+        "i32_output_1",
+        QConvProblem {
+            shape_in: CHW.from_n_c_hw(1, 1, [1]).unwrap(),
+            co: 1,
+            kernel_format: OIHW,
+            group: 1,
+            kernel: tensor3(&[[[20i8]]]),
+            bias: None,
+            data: tensor2(&[[94i8]]),
+            qp,
+            raw_output_dt: DatumType::I32,
+        },
+    );
     Ok(suite)
 }