Merge pull request google#6267 from mcr229:fc_qcint32_bias

PiperOrigin-RevId: 627715579
phoebesv · Apr 24, 2024 · 8637b70 · 8637b70
2 parents cae3022 + 7ce200a
commit 8637b70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/subgraph/fully-connected.c b/src/subgraph/fully-connected.c
@@ -702,7 +702,7 @@ static inline enum xnn_compute_type validate_datatypes_with_bias(
       {
         return xnn_compute_type_qd8_to_fp16;
       } else if (input_datatype == xnn_datatype_qint8 &&
-          bias_datatype == xnn_datatype_qint32 &&
+          bias_datatype == xnn_datatype_qcint32 &&
           output_datatype == xnn_datatype_qint8)
       {
         return xnn_compute_type_qc8;
@@ -952,6 +952,7 @@ enum xnn_status xnn_define_fully_connected(
       case xnn_datatype_fp16:
       case xnn_datatype_fp32:
       case xnn_datatype_qint32:
+      case xnn_datatype_qcint32:
         break;
       default:
         xnn_log_error(

diff --git a/test/fully-connected.cc b/test/fully-connected.cc
@@ -168,8 +168,8 @@ TEST_F(FullyConnectedTestQC8, define)
 
   uint32_t bias_id = XNN_INVALID_VALUE_ID;
   ASSERT_EQ(
-    xnn_status_success, xnn_define_quantized_tensor_value(
-                          subgraph, xnn_datatype_qint32, 0, 1.0f, bias_dims.size(), bias_dims.data(), bias.data(),
+    xnn_status_success, xnn_define_channelwise_quantized_tensor_value(
+                          subgraph, xnn_datatype_qcint32, scale.data(), bias_dims.size(), 0, bias_dims.data(), bias.data(),
                           /*external_id=*/2, /*flags=*/0, &bias_id));
 
   uint32_t output_id = XNN_INVALID_VALUE_ID;
@@ -687,7 +687,6 @@ TEST_F(FullyConnectedTestQC8, matches_operator_api)
   std::fill(subgraph_output.begin(), subgraph_output.end(), INT8_C(0xA5));
   const int8_t input_zero_point = -1;
   const float input_scale = scale_dist(rng);
-  const float kernel_scale = scale_dist(rng);
   std::vector<float> requantization_scales(output_channels, 1.0f);
   std::generate(requantization_scales.begin(), requantization_scales.end(), [&]() { return f32dist(rng); });
 
@@ -756,8 +755,8 @@ TEST_F(FullyConnectedTestQC8, matches_operator_api)
 
   uint32_t bias_id = XNN_INVALID_VALUE_ID;
   ASSERT_EQ(
-    xnn_status_success, xnn_define_quantized_tensor_value(
-                          subgraph, xnn_datatype_qint32, 0, kernel_scale, bias_dims.size(), bias_dims.data(),
+    xnn_status_success, xnn_define_channelwise_quantized_tensor_value(
+                          subgraph, xnn_datatype_qcint32, requantization_scales.data(), bias_dims.size(), 0, bias_dims.data(),
                           bias.data(), /*external_id=*/2, /*flags=*/0, &bias_id));
 
   uint32_t output_id = XNN_INVALID_VALUE_ID;