Remove redundant params from OperandType construct

Refactor the OperandType constructor accepting
SymmPerChannelQuantParams, removing the scale and zeroPoint parameters
since the constructor must be used only to build operands of type
TENSOR_QUANT8_SYMM_PER_CHANNEL and those two params values are then fixed.

Bug: 129295137
Test: NeuralNetworksTest_static
Change-Id: I133917525f2f0aa3843e1aa5515dfc18389329e7
Merged-In: I133917525f2f0aa3843e1aa5515dfc18389329e7
(cherry picked from commit f8670325481ab4a534641937cb74702c0cccf055)
diff --git a/runtime/include/NeuralNetworksWrapper.h b/runtime/include/NeuralNetworksWrapper.h
index c1c6564..486bc8e 100644
--- a/runtime/include/NeuralNetworksWrapper.h
+++ b/runtime/include/NeuralNetworksWrapper.h
@@ -127,15 +127,16 @@
         };
     }
 
-    OperandType(Type type, std::vector<uint32_t> data, float scale, int32_t zeroPoint,
-                SymmPerChannelQuantParams&& channelQuant)
+    OperandType(Type type, std::vector<uint32_t> data, SymmPerChannelQuantParams&& channelQuant)
         : dimensions(std::move(data)), channelQuant(std::move(channelQuant)) {
+        assert(type == Type::TENSOR_QUANT8_SYMM_PER_CHANNEL);
+
         operandType = {
                 .type = static_cast<int32_t>(type),
                 .dimensionCount = static_cast<uint32_t>(dimensions.size()),
                 .dimensions = dimensions.size() > 0 ? dimensions.data() : nullptr,
-                .scale = scale,
-                .zeroPoint = zeroPoint,
+                .scale = 0.0f,
+                .zeroPoint = 0,
         };
     }
 };
diff --git a/runtime/test/Android.bp b/runtime/test/Android.bp
index 167314e..caff595 100644
--- a/runtime/test/Android.bp
+++ b/runtime/test/Android.bp
@@ -74,6 +74,9 @@
     static_libs: [
         "libgmock",
     ],
+    cflags: [
+         "-UNDEBUG"
+    ],
 }
 
 cc_test {
diff --git a/runtime/test/TestPartitioning.cpp b/runtime/test/TestPartitioning.cpp
index 6970e48..56ba108 100644
--- a/runtime/test/TestPartitioning.cpp
+++ b/runtime/test/TestPartitioning.cpp
@@ -518,7 +518,7 @@
             }
 
             case ANEURALNETWORKS_TENSOR_QUANT8_SYMM_PER_CHANNEL: {
-                WrapperOperandType wrapperOperandType(wrapperType, {1}, 0.0f, 0,
+                WrapperOperandType wrapperOperandType(wrapperType, {1},
                                                       WrapperSymmPerChannelQuantParams({1.0f}, 0));
                 mWrapperOperandType.push_back(wrapperOperandType);
                 return WrapperModel::addOperand(&wrapperOperandType);
diff --git a/runtime/test/generated/models/conv2d_per_channel.model.cpp b/runtime/test/generated/models/conv2d_per_channel.model.cpp
index 212d801..f8c4178 100644
--- a/runtime/test/generated/models/conv2d_per_channel.model.cpp
+++ b/runtime/test/generated/models/conv2d_per_channel.model.cpp
@@ -2,7 +2,7 @@
 // Generated file (from: conv2d_per_channel.mod.py). Do not edit
 void CreateModel(Model *model) {
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 2}, 0.5f, 128);
-  OperandType type1(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type1(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type3(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 3}, 1.0f, 128);
   OperandType type4(Type::INT32, {});
@@ -52,7 +52,7 @@
 
 void CreateModel_weight_as_input(Model *model) {
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 2}, 0.5f, 128);
-  OperandType type18(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type18(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type3(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 3}, 1.0f, 128);
   OperandType type4(Type::INT32, {});
@@ -98,7 +98,7 @@
 
 void CreateModel_dynamic_output_shape(Model *model) {
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 2}, 0.5f, 128);
-  OperandType type1(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type1(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type19(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type4(Type::INT32, {});
@@ -150,7 +150,7 @@
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 2}, 0.5f, 128);
   OperandType type19(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type2(Type::TENSOR_INT32, {3});
-  OperandType type20(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type20(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
   auto op1 = model->addOperand(&type0);
@@ -198,7 +198,7 @@
   OperandType type3(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 3}, 1.0f, 128);
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::BOOL, {});
-  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   // Phase 1, operands
   auto op11 = model->addOperand(&type0);
   auto op21 = model->addOperand(&type6);
@@ -249,7 +249,7 @@
 void CreateModel_layouts_nhwc_weight_as_input(Model *model) {
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 2}, 0.5f, 128);
   OperandType type2(Type::TENSOR_INT32, {3});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type3(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 3}, 1.0f, 128);
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::BOOL, {});
@@ -302,7 +302,7 @@
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 1}, 1.0f, 128);
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::BOOL, {});
-  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   // Phase 1, operands
   auto op11 = model->addOperand(&type22);
   auto op21 = model->addOperand(&type6);
@@ -354,7 +354,7 @@
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type22(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 1}, 0.5f, 128);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 1}, 1.0f, 128);
-  OperandType type24(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type24(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::BOOL, {});
   // Phase 1, operands
@@ -406,7 +406,7 @@
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::BOOL, {});
-  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   // Phase 1, operands
   auto op11 = model->addOperand(&type0);
   auto op21 = model->addOperand(&type6);
@@ -458,7 +458,7 @@
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 2}, 0.5f, 128);
   OperandType type19(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type2(Type::TENSOR_INT32, {3});
-  OperandType type25(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type25(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::BOOL, {});
   // Phase 1, operands
@@ -510,7 +510,7 @@
   OperandType type22(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 1}, 0.5f, 128);
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::BOOL, {});
-  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   // Phase 1, operands
   auto op11 = model->addOperand(&type22);
   auto op21 = model->addOperand(&type6);
@@ -562,7 +562,7 @@
   OperandType type19(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type22(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 1}, 0.5f, 128);
-  OperandType type26(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type26(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::BOOL, {});
   // Phase 1, operands
@@ -615,7 +615,7 @@
   OperandType type13(Type::FLOAT32, {});
   OperandType type14(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 0.5f, 128);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 2, 2, 2}, 0.5f, 128);
-  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type17(Type::TENSOR_QUANT8_ASYMM, {0, 2, 2, 3}, 1.0f, 128);
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type4(Type::INT32, {});
@@ -728,7 +728,7 @@
   OperandType type12(Type::TENSOR_INT32, {1});
   OperandType type13(Type::FLOAT32, {});
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 2, 2, 2}, 0.5f, 128);
-  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type27(Type::TENSOR_QUANT8_ASYMM, {1, 2, 1, 1}, 0.5f, 128);
   OperandType type28(Type::TENSOR_QUANT8_ASYMM, {0, 3, 2, 2}, 1.0f, 128);
@@ -843,7 +843,7 @@
   OperandType type13(Type::FLOAT32, {});
   OperandType type14(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 0.5f, 128);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 2, 2, 2}, 0.5f, 128);
-  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type19(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type4(Type::INT32, {});
@@ -956,7 +956,7 @@
   OperandType type12(Type::TENSOR_INT32, {1});
   OperandType type13(Type::FLOAT32, {});
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 2, 2, 2}, 0.5f, 128);
-  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
+  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 2}, SymmPerChannelQuantParams({0.5f, 0.75f, 1.0f},0));
   OperandType type19(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type2(Type::TENSOR_INT32, {3});
   OperandType type27(Type::TENSOR_QUANT8_ASYMM, {1, 2, 1, 1}, 0.5f, 128);
diff --git a/runtime/test/generated/models/conv2d_v1_2.model.cpp b/runtime/test/generated/models/conv2d_v1_2.model.cpp
index cac2d20..75c698a 100644
--- a/runtime/test/generated/models/conv2d_v1_2.model.cpp
+++ b/runtime/test/generated/models/conv2d_v1_2.model.cpp
@@ -165,7 +165,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type32(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 1}, 0.5f, 0);
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.125f, 0);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.125f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, SymmPerChannelQuantParams({0.125f},0));
   OperandType type36(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -421,7 +421,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type32(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 1}, 0.5f, 0);
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.125f, 0);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.125f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, SymmPerChannelQuantParams({0.125f},0));
   OperandType type36(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -682,7 +682,7 @@
 
 void CreateModel_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.125f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, SymmPerChannelQuantParams({0.125f},0));
   OperandType type36(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type42(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 3}, 0.5f, 0);
@@ -942,7 +942,7 @@
 
 void CreateModel_nchw_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.125f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, SymmPerChannelQuantParams({0.125f},0));
   OperandType type36(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type42(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 3}, 0.5f, 0);
@@ -1207,7 +1207,7 @@
 void CreateModel_dynamic_output_shape_nhwc_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type32(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 1}, 0.5f, 0);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.125f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, SymmPerChannelQuantParams({0.125f},0));
   OperandType type36(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type47(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.125f, 0);
@@ -1467,7 +1467,7 @@
 void CreateModel_dynamic_output_shape_nhwc_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type32(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 1}, 0.5f, 0);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.125f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, SymmPerChannelQuantParams({0.125f},0));
   OperandType type36(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type47(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.125f, 0);
@@ -1730,7 +1730,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.125f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, SymmPerChannelQuantParams({0.125f},0));
   OperandType type36(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type42(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 3}, 0.5f, 0);
@@ -1990,7 +1990,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.125f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 1}, SymmPerChannelQuantParams({0.125f},0));
   OperandType type36(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type42(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 3}, 0.5f, 0);
@@ -2228,7 +2228,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type49(Type::TENSOR_QUANT8_ASYMM, {1, 3, 4, 1}, 0.5f, 127);
   OperandType type52(Type::TENSOR_QUANT8_ASYMM, {1, 3, 4, 1}, 1.0f, 50);
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {1}, 0.0f, 0);
   // Phase 1, operands
   auto op11 = model->addOperand(&type49);
@@ -2440,7 +2440,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type49(Type::TENSOR_QUANT8_ASYMM, {1, 3, 4, 1}, 0.5f, 127);
   OperandType type52(Type::TENSOR_QUANT8_ASYMM, {1, 3, 4, 1}, 1.0f, 50);
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {1}, 0.0f, 0);
   // Phase 1, operands
   auto op11 = model->addOperand(&type49);
@@ -2654,7 +2654,7 @@
 void CreateModel_nchw_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type57(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 4}, 0.5f, 127);
   OperandType type58(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 4}, 1.0f, 50);
@@ -2866,7 +2866,7 @@
 void CreateModel_nchw_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type57(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 4}, 0.5f, 127);
   OperandType type58(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 4}, 1.0f, 50);
@@ -3085,7 +3085,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type49(Type::TENSOR_QUANT8_ASYMM, {1, 3, 4, 1}, 0.5f, 127);
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 50);
   // Phase 1, operands
@@ -3300,7 +3300,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type49(Type::TENSOR_QUANT8_ASYMM, {1, 3, 4, 1}, 0.5f, 127);
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 50);
   // Phase 1, operands
@@ -3518,7 +3518,7 @@
 void CreateModel_dynamic_output_shape_nchw_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type57(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 4}, 0.5f, 127);
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 50);
@@ -3733,7 +3733,7 @@
 void CreateModel_dynamic_output_shape_nchw_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type57(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 4}, 0.5f, 127);
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 50);
@@ -3977,7 +3977,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type61(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 3}, 0.5f, 0);
-  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
+  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
   OperandType type65(Type::TENSOR_INT32, {3}, 0.0f, 0);
   // Phase 1, operands
   auto op12 = model->addOperand(&type61);
@@ -4232,7 +4232,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type61(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 3}, 0.5f, 0);
-  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
+  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
   OperandType type65(Type::TENSOR_INT32, {3}, 0.0f, 0);
   // Phase 1, operands
   auto op12 = model->addOperand(&type61);
@@ -4490,7 +4490,7 @@
 void CreateModel_channel_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
+  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
   OperandType type65(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type70(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 1}, 0.5f, 0);
   // Phase 1, operands
@@ -4745,7 +4745,7 @@
 void CreateModel_channel_nchw_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
+  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
   OperandType type65(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type70(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 1}, 0.5f, 0);
   // Phase 1, operands
@@ -5008,7 +5008,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type61(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 3}, 0.5f, 0);
-  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
+  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
   OperandType type65(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type72(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 0);
   // Phase 1, operands
@@ -5268,7 +5268,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type61(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 3}, 0.5f, 0);
-  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
+  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
   OperandType type65(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type72(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 0);
   // Phase 1, operands
@@ -5531,7 +5531,7 @@
 void CreateModel_channel_dynamic_output_shape_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
+  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
   OperandType type65(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type70(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 1}, 0.5f, 0);
   OperandType type72(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 0);
@@ -5791,7 +5791,7 @@
 void CreateModel_channel_dynamic_output_shape_nchw_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
+  OperandType type64(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 0.4f, 0.3f},0));
   OperandType type65(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type70(Type::TENSOR_QUANT8_ASYMM, {1, 3, 1, 1}, 0.5f, 0);
   OperandType type72(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 0);
@@ -6055,7 +6055,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type73(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 128);
   OperandType type75(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 2.0f, 0);
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {3}, 0.0f, 0);
   // Phase 1, operands
   auto op13 = model->addOperand(&type73);
@@ -6108,7 +6108,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type78(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 1.0f, 127);
-  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
+  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
   OperandType type80(Type::TENSOR_INT32, {3}, 0.0f, 0);
   // Phase 1, operands
   auto op13 = model->addOperand(&type78);
@@ -6365,7 +6365,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type73(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 128);
   OperandType type75(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 2.0f, 0);
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {3}, 0.0f, 0);
   // Phase 1, operands
   auto op13 = model->addOperand(&type73);
@@ -6414,7 +6414,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type78(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 1.0f, 127);
-  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
+  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
   OperandType type80(Type::TENSOR_INT32, {3}, 0.0f, 0);
   // Phase 1, operands
   auto op13 = model->addOperand(&type78);
@@ -6673,7 +6673,7 @@
 void CreateModel_large_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type82(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 0.5f, 128);
   OperandType type83(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 2.0f, 0);
@@ -6727,7 +6727,7 @@
 void CreateModel_large_nchw_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
+  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
   OperandType type80(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type84(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 1.0f, 127);
   // Phase 1, operands
@@ -6983,7 +6983,7 @@
 void CreateModel_large_nchw_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type82(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 0.5f, 128);
   OperandType type83(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 2.0f, 0);
@@ -7033,7 +7033,7 @@
 void CreateModel_large_nchw_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
+  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
   OperandType type80(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type84(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 1.0f, 127);
   // Phase 1, operands
@@ -7296,7 +7296,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type73(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 128);
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type86(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 0);
   // Phase 1, operands
@@ -7350,7 +7350,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type78(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 1.0f, 127);
-  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
+  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
   OperandType type80(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type87(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 127);
   // Phase 1, operands
@@ -7610,7 +7610,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type73(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 128);
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type86(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 0);
   // Phase 1, operands
@@ -7660,7 +7660,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type78(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 1.0f, 127);
-  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
+  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
   OperandType type80(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type87(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 127);
   // Phase 1, operands
@@ -7923,7 +7923,7 @@
 void CreateModel_large_dynamic_output_shape_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type82(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 0.5f, 128);
   OperandType type86(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 0);
@@ -7977,7 +7977,7 @@
 void CreateModel_large_dynamic_output_shape_nchw_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
+  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
   OperandType type80(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type84(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 1.0f, 127);
   OperandType type87(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 127);
@@ -8237,7 +8237,7 @@
 void CreateModel_large_dynamic_output_shape_nchw_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type82(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 0.5f, 128);
   OperandType type86(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 0);
@@ -8287,7 +8287,7 @@
 void CreateModel_large_dynamic_output_shape_nchw_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
+  OperandType type79(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {3, 1, 1, 3}, SymmPerChannelQuantParams({0.5f, 1.0f, 1.005f},0));
   OperandType type80(Type::TENSOR_INT32, {3}, 0.0f, 0);
   OperandType type84(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 3}, 1.0f, 127);
   OperandType type87(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 127);
diff --git a/runtime/test/generated/models/depthwise_conv2d_per_channel.model.cpp b/runtime/test/generated/models/depthwise_conv2d_per_channel.model.cpp
index d245b6e..ffb959c 100644
--- a/runtime/test/generated/models/depthwise_conv2d_per_channel.model.cpp
+++ b/runtime/test/generated/models/depthwise_conv2d_per_channel.model.cpp
@@ -2,7 +2,7 @@
 // Generated file (from: depthwise_conv2d_per_channel.mod.py). Do not edit
 void CreateModel_same(Model *model) {
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 0);
-  OperandType type1(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.5f},3));
+  OperandType type1(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.5f, 0.5f},3));
   OperandType type2(Type::TENSOR_INT32, {2});
   OperandType type3(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 1.0f, 0);
   OperandType type4(Type::INT32, {});
@@ -55,7 +55,7 @@
 
 void CreateModel_same_weight_as_input(Model *model) {
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 0);
-  OperandType type11(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.5f},3));
+  OperandType type11(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.5f, 0.5f},3));
   OperandType type2(Type::TENSOR_INT32, {2});
   OperandType type3(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 1.0f, 0);
   OperandType type4(Type::INT32, {});
@@ -104,7 +104,7 @@
 
 void CreateModel_same_dynamic_output_shape(Model *model) {
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 0);
-  OperandType type1(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.5f},3));
+  OperandType type1(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.5f, 0.5f},3));
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 0);
   OperandType type2(Type::TENSOR_INT32, {2});
   OperandType type4(Type::INT32, {});
@@ -158,7 +158,7 @@
 void CreateModel_same_dynamic_output_shape_weight_as_input(Model *model) {
   OperandType type0(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 0);
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 0);
-  OperandType type13(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.5f},3));
+  OperandType type13(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.5f, 0.5f},3));
   OperandType type2(Type::TENSOR_INT32, {2});
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -207,7 +207,7 @@
 void CreateModel_different(Model *model) {
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 128);
-  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type7(Type::TENSOR_INT32, {4});
   OperandType type8(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 1.0f, 128);
   // Phase 1, operands
@@ -258,7 +258,7 @@
 }
 
 void CreateModel_different_weight_as_input(Model *model) {
-  OperandType type14(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type14(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 128);
   OperandType type7(Type::TENSOR_INT32, {4});
@@ -310,7 +310,7 @@
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 128);
-  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type6(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type7(Type::TENSOR_INT32, {4});
   // Phase 1, operands
   auto op11 = model->addOperand(&type5);
@@ -361,7 +361,7 @@
 
 void CreateModel_different_dynamic_output_shape_weight_as_input(Model *model) {
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
-  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type16(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 128);
   OperandType type7(Type::TENSOR_INT32, {4});
@@ -409,7 +409,7 @@
 }
 
 void CreateModel_layout_nhwc(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 128);
   OperandType type7(Type::TENSOR_INT32, {4});
@@ -466,7 +466,7 @@
 }
 
 void CreateModel_layout_nhwc_weight_as_input(Model *model) {
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 128);
   OperandType type7(Type::TENSOR_INT32, {4});
@@ -519,7 +519,7 @@
 }
 
 void CreateModel_layout_nchw(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 128);
   OperandType type19(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 1.0f, 128);
   OperandType type4(Type::INT32, {});
@@ -578,7 +578,7 @@
 void CreateModel_layout_nchw_weight_as_input(Model *model) {
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 128);
   OperandType type19(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 1.0f, 128);
-  OperandType type20(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type20(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type4(Type::INT32, {});
   OperandType type7(Type::TENSOR_INT32, {4});
   OperandType type9(Type::BOOL, {});
@@ -629,7 +629,7 @@
 }
 
 void CreateModel_layout_dynamic_output_shape_nhwc(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 128);
@@ -687,7 +687,7 @@
 
 void CreateModel_layout_dynamic_output_shape_nhwc_weight_as_input(Model *model) {
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type4(Type::INT32, {});
   OperandType type5(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 128);
   OperandType type7(Type::TENSOR_INT32, {4});
@@ -739,7 +739,7 @@
 }
 
 void CreateModel_layout_dynamic_output_shape_nchw(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 128);
   OperandType type4(Type::INT32, {});
@@ -798,7 +798,7 @@
 void CreateModel_layout_dynamic_output_shape_nchw_weight_as_input(Model *model) {
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 128);
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 128);
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 0.5f, 1.0f, 0.5f},3));
   OperandType type4(Type::INT32, {});
   OperandType type7(Type::TENSOR_INT32, {4});
   OperandType type9(Type::BOOL, {});
diff --git a/runtime/test/generated/models/depthwise_conv2d_v1_2.model.cpp b/runtime/test/generated/models/depthwise_conv2d_v1_2.model.cpp
index c5e627f..31065c9 100644
--- a/runtime/test/generated/models/depthwise_conv2d_v1_2.model.cpp
+++ b/runtime/test/generated/models/depthwise_conv2d_v1_2.model.cpp
@@ -173,7 +173,7 @@
 void CreateModel_nhwc_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 0);
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type20(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type21(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 0.1f, 0);
   OperandType type4(Type::INT32, {});
@@ -230,7 +230,7 @@
 void CreateModel_nhwc_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 0);
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type23(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type24(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 0.0001f, 0);
   OperandType type4(Type::INT32, {});
@@ -502,7 +502,7 @@
 void CreateModel_nhwc_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 0);
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type20(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type21(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 0.1f, 0);
   OperandType type4(Type::INT32, {});
@@ -555,7 +555,7 @@
 void CreateModel_nhwc_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 0);
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type23(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type24(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 0.0001f, 0);
   OperandType type4(Type::INT32, {});
@@ -833,7 +833,7 @@
 
 void CreateModel_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type20(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type31(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 0);
   OperandType type32(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 0.1f, 0);
@@ -890,7 +890,7 @@
 
 void CreateModel_nchw_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type23(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type31(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 0);
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 0.0001f, 0);
@@ -1165,7 +1165,7 @@
 
 void CreateModel_nchw_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type20(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type31(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 0);
   OperandType type32(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 0.1f, 0);
@@ -1218,7 +1218,7 @@
 
 void CreateModel_nchw_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type23(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type31(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 0);
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 0.0001f, 0);
@@ -1498,7 +1498,7 @@
 void CreateModel_dynamic_output_shape_nhwc_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 0);
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type20(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type36(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 0);
   OperandType type4(Type::INT32, {});
@@ -1555,7 +1555,7 @@
 void CreateModel_dynamic_output_shape_nhwc_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 0);
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type23(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.0001f, 0);
   OperandType type4(Type::INT32, {});
@@ -1830,7 +1830,7 @@
 void CreateModel_dynamic_output_shape_nhwc_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 0);
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type20(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type36(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 0);
   OperandType type4(Type::INT32, {});
@@ -1883,7 +1883,7 @@
 void CreateModel_dynamic_output_shape_nhwc_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type18(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.5f, 0);
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type23(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.0001f, 0);
   OperandType type4(Type::INT32, {});
@@ -2161,7 +2161,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type20(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type31(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 0);
   OperandType type36(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 0);
@@ -2218,7 +2218,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type23(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type31(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 0);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.0001f, 0);
@@ -2493,7 +2493,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_weight_as_input_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type20(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type31(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 0);
   OperandType type36(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 0);
@@ -2546,7 +2546,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
+  OperandType type22(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.01f, 0.005f, 0.01f, 0.005f},3));
   OperandType type23(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type31(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.5f, 0);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.0001f, 0);
@@ -2849,7 +2849,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type40(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 0.5f, 128);
   OperandType type43(Type::TENSOR_QUANT8_ASYMM, {1, 2, 1, 4}, 1.0f, 100);
-  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
+  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
   OperandType type45(Type::TENSOR_INT32, {4}, 0.0f, 0);
   // Phase 1, operands
   auto op11 = model->addOperand(&type40);
@@ -3075,7 +3075,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type40(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 0.5f, 128);
   OperandType type43(Type::TENSOR_QUANT8_ASYMM, {1, 2, 1, 4}, 1.0f, 100);
-  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
+  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
   OperandType type45(Type::TENSOR_INT32, {4}, 0.0f, 0);
   // Phase 1, operands
   auto op11 = model->addOperand(&type40);
@@ -3311,7 +3311,7 @@
 void CreateModel_nchw_channelQuant8_3(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
+  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
   OperandType type45(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type50(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 0.5f, 128);
   OperandType type51(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 1}, 1.0f, 100);
@@ -3537,7 +3537,7 @@
 void CreateModel_nchw_weight_as_input_channelQuant8_3(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
+  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
   OperandType type45(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type50(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 0.5f, 128);
   OperandType type51(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 1}, 1.0f, 100);
@@ -3776,7 +3776,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type40(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 0.5f, 128);
-  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
+  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
   OperandType type45(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type52(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 100);
   // Phase 1, operands
@@ -4002,7 +4002,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type40(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 0.5f, 128);
-  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
+  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
   OperandType type45(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type52(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 100);
   // Phase 1, operands
@@ -4239,7 +4239,7 @@
 void CreateModel_dynamic_output_shape_nchw_channelQuant8_3(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
+  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
   OperandType type45(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type50(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 0.5f, 128);
   OperandType type52(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 100);
@@ -4465,7 +4465,7 @@
 void CreateModel_dynamic_output_shape_nchw_weight_as_input_channelQuant8_3(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
+  OperandType type44(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({0.5f, 0.25f, 0.5f, 0.25f},3));
   OperandType type45(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type50(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 0.5f, 128);
   OperandType type52(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 1.0f, 100);
@@ -4738,7 +4738,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type59(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 2.0f, 128);
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 128);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.125f, 0.25f},3));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.125f, 0.25f},3));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op12 = model->addOperand(&type60);
@@ -5006,7 +5006,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type59(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 2.0f, 128);
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 128);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.125f, 0.25f},3));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.125f, 0.25f},3));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op12 = model->addOperand(&type60);
@@ -5285,7 +5285,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 128);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.125f, 0.25f},3));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.125f, 0.25f},3));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type65(Type::TENSOR_QUANT8_ASYMM, {1, 2, 1, 1}, 2.0f, 128);
   // Phase 1, operands
@@ -5553,7 +5553,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 128);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.125f, 0.25f},3));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.125f, 0.25f},3));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type65(Type::TENSOR_QUANT8_ASYMM, {1, 2, 1, 1}, 2.0f, 128);
   // Phase 1, operands
@@ -5833,7 +5833,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 128);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.125f, 0.25f},3));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.125f, 0.25f},3));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type66(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 128);
   // Phase 1, operands
@@ -6101,7 +6101,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 128);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.125f, 0.25f},3));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.125f, 0.25f},3));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type66(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 128);
   // Phase 1, operands
@@ -6381,7 +6381,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 128);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.125f, 0.25f},3));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.125f, 0.25f},3));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type66(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 128);
   // Phase 1, operands
@@ -6649,7 +6649,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type60(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 128);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, 0.0f, 0, SymmPerChannelQuantParams({0.125f, 0.25f},3));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 2}, SymmPerChannelQuantParams({0.125f, 0.25f},3));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type66(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 128);
   // Phase 1, operands
@@ -6930,7 +6930,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type41(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 0.5f, 128);
   OperandType type70(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 4}, 50.0f, 0);
-  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
+  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
   OperandType type72(Type::TENSOR_INT32, {4}, 0.0f, 0);
   // Phase 1, operands
   auto op13 = model->addOperand(&type41);
@@ -7198,7 +7198,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type41(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 0.5f, 128);
   OperandType type70(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 4}, 50.0f, 0);
-  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
+  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
   OperandType type72(Type::TENSOR_INT32, {4}, 0.0f, 0);
   // Phase 1, operands
   auto op13 = model->addOperand(&type41);
@@ -7479,7 +7479,7 @@
 void CreateModel_large_nchw_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
+  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
   OperandType type72(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type75(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 0.5f, 128);
   OperandType type76(Type::TENSOR_QUANT8_ASYMM, {1, 4, 1, 1}, 50.0f, 0);
@@ -7750,7 +7750,7 @@
 void CreateModel_large_nchw_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
+  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
   OperandType type72(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type75(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 0.5f, 128);
   OperandType type76(Type::TENSOR_QUANT8_ASYMM, {1, 4, 1, 1}, 50.0f, 0);
@@ -8031,7 +8031,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type41(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 0.5f, 128);
-  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
+  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
   OperandType type72(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type77(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 50.0f, 0);
   // Phase 1, operands
@@ -8299,7 +8299,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
   OperandType type41(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 4}, 0.5f, 128);
-  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
+  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
   OperandType type72(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type77(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 50.0f, 0);
   // Phase 1, operands
@@ -8581,7 +8581,7 @@
 void CreateModel_large_dynamic_output_shape_nchw_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
+  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
   OperandType type72(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type75(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 0.5f, 128);
   OperandType type77(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 50.0f, 0);
@@ -8852,7 +8852,7 @@
 void CreateModel_large_dynamic_output_shape_nchw_weight_as_input_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::INT32, {});
-  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, 0.0f, 0, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
+  OperandType type71(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 2, 2, 4}, SymmPerChannelQuantParams({1.0f, 2.0f, 1.0f, 1.0f},3));
   OperandType type72(Type::TENSOR_INT32, {4}, 0.0f, 0);
   OperandType type75(Type::TENSOR_QUANT8_ASYMM, {1, 4, 2, 2}, 0.5f, 128);
   OperandType type77(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 50.0f, 0);
diff --git a/runtime/test/generated/models/dequantize_v1_2.model.cpp b/runtime/test/generated/models/dequantize_v1_2.model.cpp
index 39805cb..23a0a79 100644
--- a/runtime/test/generated/models/dequantize_v1_2.model.cpp
+++ b/runtime/test/generated/models/dequantize_v1_2.model.cpp
@@ -497,7 +497,7 @@
 }
 
 void CreateModel_5(Model *model) {
-  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 0.5f},0));
+  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 0.5f},0));
   OperandType type9(Type::TENSOR_FLOAT32, {2, 3, 4});
   // Phase 1, operands
   auto input04 = model->addOperand(&type8);
@@ -517,7 +517,7 @@
 }
 
 void CreateModel_relaxed_5(Model *model) {
-  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 0.5f},0));
+  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 0.5f},0));
   OperandType type9(Type::TENSOR_FLOAT32, {2, 3, 4});
   // Phase 1, operands
   auto input04 = model->addOperand(&type8);
@@ -540,7 +540,7 @@
 
 void CreateModel_float16_5(Model *model) {
   OperandType type37(Type::TENSOR_FLOAT16, {2, 3, 4});
-  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 0.5f},0));
+  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 0.5f},0));
   // Phase 1, operands
   auto input04 = model->addOperand(&type8);
   auto output04 = model->addOperand(&type37);
@@ -560,7 +560,7 @@
 
 void CreateModel_dynamic_output_shape_5(Model *model) {
   OperandType type32(Type::TENSOR_FLOAT32, {0, 0, 0});
-  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 0.5f},0));
+  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 0.5f},0));
   // Phase 1, operands
   auto input04 = model->addOperand(&type8);
   auto output04 = model->addOperand(&type32);
@@ -580,7 +580,7 @@
 
 void CreateModel_dynamic_output_shape_relaxed_5(Model *model) {
   OperandType type32(Type::TENSOR_FLOAT32, {0, 0, 0});
-  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 0.5f},0));
+  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 0.5f},0));
   // Phase 1, operands
   auto input04 = model->addOperand(&type8);
   auto output04 = model->addOperand(&type32);
@@ -602,7 +602,7 @@
 
 void CreateModel_dynamic_output_shape_float16_5(Model *model) {
   OperandType type33(Type::TENSOR_FLOAT16, {0, 0, 0});
-  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 0.5f},0));
+  OperandType type8(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 0.5f},0));
   // Phase 1, operands
   auto input04 = model->addOperand(&type8);
   auto output04 = model->addOperand(&type33);
@@ -621,7 +621,7 @@
 }
 
 void CreateModel_6(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
   OperandType type9(Type::TENSOR_FLOAT32, {2, 3, 4});
   // Phase 1, operands
   auto input05 = model->addOperand(&type10);
@@ -641,7 +641,7 @@
 }
 
 void CreateModel_relaxed_6(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
   OperandType type9(Type::TENSOR_FLOAT32, {2, 3, 4});
   // Phase 1, operands
   auto input05 = model->addOperand(&type10);
@@ -663,7 +663,7 @@
 }
 
 void CreateModel_float16_6(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
   OperandType type37(Type::TENSOR_FLOAT16, {2, 3, 4});
   // Phase 1, operands
   auto input05 = model->addOperand(&type10);
@@ -683,7 +683,7 @@
 }
 
 void CreateModel_dynamic_output_shape_6(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
   OperandType type32(Type::TENSOR_FLOAT32, {0, 0, 0});
   // Phase 1, operands
   auto input05 = model->addOperand(&type10);
@@ -703,7 +703,7 @@
 }
 
 void CreateModel_dynamic_output_shape_relaxed_6(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
   OperandType type32(Type::TENSOR_FLOAT32, {0, 0, 0});
   // Phase 1, operands
   auto input05 = model->addOperand(&type10);
@@ -725,7 +725,7 @@
 }
 
 void CreateModel_dynamic_output_shape_float16_6(Model *model) {
-  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
+  OperandType type10(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 4}, SymmPerChannelQuantParams({2.0f, 1.0f, 0.5f},1));
   OperandType type33(Type::TENSOR_FLOAT16, {0, 0, 0});
   // Phase 1, operands
   auto input05 = model->addOperand(&type10);
diff --git a/runtime/test/generated/models/grouped_conv2d.model.cpp b/runtime/test/generated/models/grouped_conv2d.model.cpp
index 4aed3c9..4c4795d 100644
--- a/runtime/test/generated/models/grouped_conv2d.model.cpp
+++ b/runtime/test/generated/models/grouped_conv2d.model.cpp
@@ -448,7 +448,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -505,7 +505,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type19(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type20(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -557,7 +557,7 @@
 void CreateModel_nhwc_none_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
@@ -615,7 +615,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
-  OperandType type24(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type24(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type25(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -1222,7 +1222,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -1279,7 +1279,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type32(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type32(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type33(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -1331,7 +1331,7 @@
 void CreateModel_nhwc_relu_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
@@ -1389,7 +1389,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
-  OperandType type34(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type34(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type35(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -1996,7 +1996,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -2053,7 +2053,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type36(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type36(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type37(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -2105,7 +2105,7 @@
 void CreateModel_nhwc_relu1_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
@@ -2163,7 +2163,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
-  OperandType type38(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type38(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type39(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -2770,7 +2770,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -2828,7 +2828,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
   OperandType type4(Type::INT32, {});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -2879,7 +2879,7 @@
 void CreateModel_nhwc_relu6_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
@@ -2938,7 +2938,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
-  OperandType type42(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type42(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type43(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -3543,7 +3543,7 @@
 void CreateModel_nchw_none_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -3602,7 +3602,7 @@
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
-  OperandType type46(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type46(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type47(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -3652,7 +3652,7 @@
 
 void CreateModel_nchw_none_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
@@ -3712,7 +3712,7 @@
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
-  OperandType type48(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type48(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type49(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -4317,7 +4317,7 @@
 void CreateModel_nchw_relu_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -4376,7 +4376,7 @@
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
-  OperandType type51(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type51(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type52(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -4426,7 +4426,7 @@
 
 void CreateModel_nchw_relu_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
@@ -4486,7 +4486,7 @@
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
-  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type53(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type54(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -5091,7 +5091,7 @@
 void CreateModel_nchw_relu1_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -5150,7 +5150,7 @@
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
-  OperandType type55(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type55(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type56(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -5200,7 +5200,7 @@
 
 void CreateModel_nchw_relu1_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
@@ -5260,7 +5260,7 @@
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
-  OperandType type57(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type57(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type58(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -5865,7 +5865,7 @@
 void CreateModel_nchw_relu6_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -5924,7 +5924,7 @@
   OperandType type15(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.5f, 80);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
-  OperandType type59(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type59(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type60(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -5974,7 +5974,7 @@
 
 void CreateModel_nchw_relu6_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
@@ -6034,7 +6034,7 @@
   OperandType type23(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 2}, 0.1f, 80);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
-  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type61(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type62(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -6639,7 +6639,7 @@
 void CreateModel_dynamic_output_shape_nhwc_none_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
@@ -6698,7 +6698,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type4(Type::INT32, {});
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type66(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type66(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type67(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -6749,7 +6749,7 @@
 void CreateModel_dynamic_output_shape_nhwc_none_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
@@ -6808,7 +6808,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type4(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type69(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type69(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type70(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -7413,7 +7413,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
@@ -7472,7 +7472,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type4(Type::INT32, {});
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type72(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type72(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type73(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -7523,7 +7523,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
@@ -7582,7 +7582,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type4(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type74(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type74(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type75(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -8187,7 +8187,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu1_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
@@ -8246,7 +8246,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type4(Type::INT32, {});
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -8297,7 +8297,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu1_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
@@ -8356,7 +8356,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type4(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type78(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type78(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type79(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -8961,7 +8961,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu6_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
@@ -9020,7 +9020,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type4(Type::INT32, {});
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type80(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type80(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type81(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -9071,7 +9071,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu6_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
@@ -9130,7 +9130,7 @@
   OperandType type12(Type::TENSOR_QUANT8_ASYMM, {1, 3, 3, 2}, 0.25f, 100);
   OperandType type4(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type82(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type82(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type83(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type12);
@@ -9734,7 +9734,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_none_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -9794,7 +9794,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type84(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type84(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type85(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -9844,7 +9844,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_none_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -9904,7 +9904,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type86(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type86(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type87(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -10508,7 +10508,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -10568,7 +10568,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type88(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type88(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type89(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -10618,7 +10618,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -10678,7 +10678,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type90(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type90(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type91(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -11282,7 +11282,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu1_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -11342,7 +11342,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type92(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type92(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type93(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -11392,7 +11392,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu1_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -11452,7 +11452,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type94(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type94(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type95(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -12056,7 +12056,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu6_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type17(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type18(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -12116,7 +12116,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
   OperandType type64(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type96(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type96(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type97(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -12166,7 +12166,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu6_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type21(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type22(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
@@ -12226,7 +12226,7 @@
   OperandType type4(Type::INT32, {});
   OperandType type45(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 3}, 0.25f, 100);
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type98(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type98(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 2, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type99(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type45);
@@ -12664,7 +12664,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type100(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 0.25f, 128);
   OperandType type103(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 10.0f, 100);
-  OperandType type104(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 2.5f},0));
+  OperandType type104(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, SymmPerChannelQuantParams({2.0f, 2.5f},0));
   OperandType type105(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -12712,7 +12712,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type100(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 0.25f, 128);
   OperandType type103(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 10.0f, 100);
-  OperandType type106(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 2.5f},0));
+  OperandType type106(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, SymmPerChannelQuantParams({2.0f, 2.5f},0));
   OperandType type107(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -13120,7 +13120,7 @@
 
 void CreateModel_large_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type104(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 2.5f},0));
+  OperandType type104(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, SymmPerChannelQuantParams({2.0f, 2.5f},0));
   OperandType type105(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type112(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 0.25f, 128);
   OperandType type113(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 10.0f, 100);
@@ -13170,7 +13170,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type112(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 0.25f, 128);
   OperandType type113(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 10.0f, 100);
-  OperandType type114(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 2.5f},0));
+  OperandType type114(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, SymmPerChannelQuantParams({2.0f, 2.5f},0));
   OperandType type115(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -13583,7 +13583,7 @@
 void CreateModel_large_dynamic_output_shape_nhwc_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type100(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 0.25f, 128);
-  OperandType type104(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 2.5f},0));
+  OperandType type104(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, SymmPerChannelQuantParams({2.0f, 2.5f},0));
   OperandType type105(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type117(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 10.0f, 100);
   OperandType type4(Type::INT32, {});
@@ -13632,7 +13632,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type100(Type::TENSOR_QUANT8_ASYMM, {1, 3, 2, 2}, 0.25f, 128);
   OperandType type117(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 10.0f, 100);
-  OperandType type118(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 2.5f},0));
+  OperandType type118(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, SymmPerChannelQuantParams({2.0f, 2.5f},0));
   OperandType type119(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -14046,7 +14046,7 @@
 
 void CreateModel_large_dynamic_output_shape_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type104(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 2.5f},0));
+  OperandType type104(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, SymmPerChannelQuantParams({2.0f, 2.5f},0));
   OperandType type105(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type112(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 0.25f, 128);
   OperandType type117(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 10.0f, 100);
@@ -14096,7 +14096,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type112(Type::TENSOR_QUANT8_ASYMM, {1, 2, 3, 2}, 0.25f, 128);
   OperandType type117(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 10.0f, 100);
-  OperandType type120(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({2.0f, 2.5f},0));
+  OperandType type120(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 2, 3, 1}, SymmPerChannelQuantParams({2.0f, 2.5f},0));
   OperandType type121(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -14512,7 +14512,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type122(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 9}, 0.5f, 0);
   OperandType type125(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 6}, 2.0f, 60);
-  OperandType type126(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
+  OperandType type126(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
   OperandType type127(Type::TENSOR_INT32, {6}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -14560,7 +14560,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type122(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 9}, 0.5f, 0);
   OperandType type125(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 6}, 2.0f, 60);
-  OperandType type128(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
+  OperandType type128(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
   OperandType type129(Type::TENSOR_INT32, {6}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -14974,7 +14974,7 @@
 
 void CreateModel_channel_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type126(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
+  OperandType type126(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
   OperandType type127(Type::TENSOR_INT32, {6}, 0.0f, 0);
   OperandType type138(Type::TENSOR_QUANT8_ASYMM, {1, 9, 2, 2}, 0.5f, 0);
   OperandType type139(Type::TENSOR_QUANT8_ASYMM, {1, 6, 2, 2}, 2.0f, 60);
@@ -15024,7 +15024,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type138(Type::TENSOR_QUANT8_ASYMM, {1, 9, 2, 2}, 0.5f, 0);
   OperandType type139(Type::TENSOR_QUANT8_ASYMM, {1, 6, 2, 2}, 2.0f, 60);
-  OperandType type140(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
+  OperandType type140(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
   OperandType type141(Type::TENSOR_INT32, {6}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -15439,7 +15439,7 @@
 void CreateModel_channel_dynamic_output_shape_nhwc_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type122(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 9}, 0.5f, 0);
-  OperandType type126(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
+  OperandType type126(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
   OperandType type127(Type::TENSOR_INT32, {6}, 0.0f, 0);
   OperandType type144(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 60);
   OperandType type4(Type::INT32, {});
@@ -15488,7 +15488,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type122(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 9}, 0.5f, 0);
   OperandType type144(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 60);
-  OperandType type145(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
+  OperandType type145(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
   OperandType type146(Type::TENSOR_INT32, {6}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
@@ -15902,7 +15902,7 @@
 
 void CreateModel_channel_dynamic_output_shape_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type126(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
+  OperandType type126(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
   OperandType type127(Type::TENSOR_INT32, {6}, 0.0f, 0);
   OperandType type138(Type::TENSOR_QUANT8_ASYMM, {1, 9, 2, 2}, 0.5f, 0);
   OperandType type144(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 60);
@@ -15952,7 +15952,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type138(Type::TENSOR_QUANT8_ASYMM, {1, 9, 2, 2}, 0.5f, 0);
   OperandType type144(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 2.0f, 60);
-  OperandType type147(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
+  OperandType type147(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {6, 1, 1, 3}, SymmPerChannelQuantParams({0.25f, 0.3f, 0.25f, 0.3f, 0.25f, 0.3f},0));
   OperandType type148(Type::TENSOR_INT32, {6}, 0.0f, 0);
   OperandType type4(Type::INT32, {});
   // Phase 1, operands
diff --git a/runtime/test/generated/models/transpose_conv2d.model.cpp b/runtime/test/generated/models/transpose_conv2d.model.cpp
index 206b4f1..3a80548 100644
--- a/runtime/test/generated/models/transpose_conv2d.model.cpp
+++ b/runtime/test/generated/models/transpose_conv2d.model.cpp
@@ -383,7 +383,7 @@
 void CreateModel_nhwc_none_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -433,7 +433,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.5f, 80);
-  OperandType type38(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type38(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type39(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -479,7 +479,7 @@
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.1f, 80);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   // Phase 1, operands
@@ -528,7 +528,7 @@
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.1f, 80);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type42(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type42(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type43(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   // Phase 1, operands
@@ -1045,7 +1045,7 @@
 void CreateModel_nhwc_relu_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -1097,7 +1097,7 @@
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
-  OperandType type50(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type50(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type51(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -1141,7 +1141,7 @@
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.1f, 80);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   // Phase 1, operands
@@ -1191,7 +1191,7 @@
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
-  OperandType type52(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type52(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type53(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -1707,7 +1707,7 @@
 void CreateModel_nhwc_relu1_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -1759,7 +1759,7 @@
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
-  OperandType type54(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type54(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type55(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -1803,7 +1803,7 @@
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.1f, 80);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   // Phase 1, operands
@@ -1853,7 +1853,7 @@
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
-  OperandType type56(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type56(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type57(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -2369,7 +2369,7 @@
 void CreateModel_nhwc_relu6_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -2421,7 +2421,7 @@
   OperandType type37(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
-  OperandType type58(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type58(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type59(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -2465,7 +2465,7 @@
   OperandType type33(Type::TENSOR_QUANT8_ASYMM, {1, 5, 5, 2}, 0.1f, 80);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   // Phase 1, operands
@@ -2515,7 +2515,7 @@
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
-  OperandType type60(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type60(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type61(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -3030,7 +3030,7 @@
 
 void CreateModel_nchw_none_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -3083,7 +3083,7 @@
   OperandType type5(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
   OperandType type69(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.5f, 80);
-  OperandType type70(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type70(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type71(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type68);
@@ -3125,7 +3125,7 @@
 void CreateModel_nchw_none_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type67(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.1f, 80);
@@ -3177,7 +3177,7 @@
   OperandType type5(Type::INT32, {});
   OperandType type67(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.1f, 80);
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
-  OperandType type72(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type72(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type73(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type68);
@@ -3692,7 +3692,7 @@
 
 void CreateModel_nchw_relu_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -3745,7 +3745,7 @@
   OperandType type5(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
   OperandType type69(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.5f, 80);
-  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type76(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type77(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type68);
@@ -3787,7 +3787,7 @@
 void CreateModel_nchw_relu_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type67(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.1f, 80);
@@ -3839,7 +3839,7 @@
   OperandType type5(Type::INT32, {});
   OperandType type67(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.1f, 80);
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
-  OperandType type78(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type78(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type79(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type68);
@@ -4354,7 +4354,7 @@
 
 void CreateModel_nchw_relu1_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -4407,7 +4407,7 @@
   OperandType type5(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
   OperandType type69(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.5f, 80);
-  OperandType type80(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type80(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type81(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type68);
@@ -4449,7 +4449,7 @@
 void CreateModel_nchw_relu1_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type67(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.1f, 80);
@@ -4501,7 +4501,7 @@
   OperandType type5(Type::INT32, {});
   OperandType type67(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.1f, 80);
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
-  OperandType type82(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type82(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type83(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type68);
@@ -5016,7 +5016,7 @@
 
 void CreateModel_nchw_relu6_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -5069,7 +5069,7 @@
   OperandType type5(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
   OperandType type69(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.5f, 80);
-  OperandType type84(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type84(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type85(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type68);
@@ -5111,7 +5111,7 @@
 void CreateModel_nchw_relu6_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type67(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.1f, 80);
@@ -5163,7 +5163,7 @@
   OperandType type5(Type::INT32, {});
   OperandType type67(Type::TENSOR_QUANT8_ASYMM, {1, 2, 5, 5}, 0.1f, 80);
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
-  OperandType type86(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type86(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type87(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type68);
@@ -5679,7 +5679,7 @@
 void CreateModel_dynamic_output_shape_nhwc_none_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -5731,7 +5731,7 @@
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
   OperandType type91(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type92(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type92(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type93(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -5774,7 +5774,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type90(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
@@ -5825,7 +5825,7 @@
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
   OperandType type90(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type94(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type94(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type95(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -6341,7 +6341,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -6393,7 +6393,7 @@
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
   OperandType type91(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
-  OperandType type97(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type97(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type98(Type::TENSOR_INT32, {2}, 0.0f, 0);
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
@@ -6436,7 +6436,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type90(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
@@ -6488,7 +6488,7 @@
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
   OperandType type90(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
-  OperandType type99(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type99(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   // Phase 1, operands
   auto op1 = model->addOperand(&type34);
   auto op2 = model->addOperand(&type99);
@@ -7003,7 +7003,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu1_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -7051,7 +7051,7 @@
 
 void CreateModel_dynamic_output_shape_nhwc_relu1_channelQuant8_weight_as_input(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type101(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type101(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type102(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -7098,7 +7098,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type90(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
@@ -7145,7 +7145,7 @@
 
 void CreateModel_dynamic_output_shape_nhwc_relu1_channelQuant8_weight_as_input_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type103(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type103(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type104(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -7665,7 +7665,7 @@
 void CreateModel_dynamic_output_shape_nhwc_relu6_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -7713,7 +7713,7 @@
 
 void CreateModel_dynamic_output_shape_nhwc_relu6_channelQuant8_weight_as_input(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type105(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type105(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type106(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -7760,7 +7760,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type90(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.1f, 80);
@@ -7807,7 +7807,7 @@
 
 void CreateModel_dynamic_output_shape_nhwc_relu6_channelQuant8_weight_as_input_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type107(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type107(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type108(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type34(Type::TENSOR_QUANT8_ASYMM, {1, 2, 2, 1}, 0.25f, 100);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -8326,7 +8326,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_none_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -8375,7 +8375,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_none_channelQuant8_weight_as_input(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type109(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type109(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type110(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -8421,7 +8421,7 @@
 void CreateModel_dynamic_output_shape_nchw_none_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
@@ -8469,7 +8469,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_none_channelQuant8_weight_as_input_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type111(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type111(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type112(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -8988,7 +8988,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -9037,7 +9037,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu_channelQuant8_weight_as_input(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type113(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type113(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type114(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -9083,7 +9083,7 @@
 void CreateModel_dynamic_output_shape_nchw_relu_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
@@ -9131,7 +9131,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu_channelQuant8_weight_as_input_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type115(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type115(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type116(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -9650,7 +9650,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu1_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -9699,7 +9699,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu1_channelQuant8_weight_as_input(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type117(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type117(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type118(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -9745,7 +9745,7 @@
 void CreateModel_dynamic_output_shape_nchw_relu1_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
@@ -9793,7 +9793,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu1_channelQuant8_weight_as_input_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type119(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type119(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type120(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -10312,7 +10312,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu6_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type35(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type36(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -10361,7 +10361,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu6_channelQuant8_weight_as_input(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type121(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type121(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type122(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -10407,7 +10407,7 @@
 void CreateModel_dynamic_output_shape_nchw_relu6_channelQuant8_2(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type4(Type::TENSOR_INT32, {4});
-  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type40(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type41(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type5(Type::INT32, {});
   OperandType type68(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 2}, 0.25f, 100);
@@ -10455,7 +10455,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_relu6_channelQuant8_weight_as_input_2(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type123(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f, 0.5f},0));
+  OperandType type123(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {2, 3, 3, 1}, SymmPerChannelQuantParams({0.25f, 0.5f},0));
   OperandType type124(Type::TENSOR_INT32, {2}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -10882,7 +10882,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type125(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 1}, 2.0f, 0);
   OperandType type128(Type::TENSOR_QUANT8_ASYMM, {1, 3, 4, 1}, 20.0f, 50);
-  OperandType type129(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f},0));
+  OperandType type129(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.25f},0));
   OperandType type130(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -10931,7 +10931,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type125(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 1}, 2.0f, 0);
   OperandType type128(Type::TENSOR_QUANT8_ASYMM, {1, 3, 4, 1}, 20.0f, 50);
-  OperandType type131(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f},0));
+  OperandType type131(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.25f},0));
   OperandType type132(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -11354,7 +11354,7 @@
 
 void CreateModel_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type129(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f},0));
+  OperandType type129(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.25f},0));
   OperandType type130(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type141(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 2.0f, 0);
   OperandType type142(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 4}, 20.0f, 50);
@@ -11405,7 +11405,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type141(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 2.0f, 0);
   OperandType type142(Type::TENSOR_QUANT8_ASYMM, {1, 1, 3, 4}, 20.0f, 50);
-  OperandType type143(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f},0));
+  OperandType type143(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.25f},0));
   OperandType type144(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -11829,7 +11829,7 @@
 void CreateModel_dynamic_output_shape_nhwc_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type125(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 1}, 2.0f, 0);
-  OperandType type129(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f},0));
+  OperandType type129(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.25f},0));
   OperandType type130(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type147(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 20.0f, 50);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -11879,7 +11879,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type125(Type::TENSOR_QUANT8_ASYMM, {1, 1, 2, 1}, 2.0f, 0);
   OperandType type147(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 20.0f, 50);
-  OperandType type148(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f},0));
+  OperandType type148(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.25f},0));
   OperandType type149(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
@@ -12302,7 +12302,7 @@
 
 void CreateModel_dynamic_output_shape_nchw_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
-  OperandType type129(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f},0));
+  OperandType type129(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.25f},0));
   OperandType type130(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type141(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 2.0f, 0);
   OperandType type147(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 20.0f, 50);
@@ -12353,7 +12353,7 @@
   OperandType type0(Type::BOOL, {});
   OperandType type141(Type::TENSOR_QUANT8_ASYMM, {1, 1, 1, 2}, 2.0f, 0);
   OperandType type147(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 20.0f, 50);
-  OperandType type150(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.25f},0));
+  OperandType type150(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {1, 3, 3, 1}, SymmPerChannelQuantParams({0.25f},0));
   OperandType type151(Type::TENSOR_INT32, {1}, 0.0f, 0);
   OperandType type4(Type::TENSOR_INT32, {4});
   OperandType type5(Type::INT32, {});
diff --git a/runtime/test/generated/models/transpose_conv2d_large.model.cpp b/runtime/test/generated/models/transpose_conv2d_large.model.cpp
index 540584d..b2b9c3e 100644
--- a/runtime/test/generated/models/transpose_conv2d_large.model.cpp
+++ b/runtime/test/generated/models/transpose_conv2d_large.model.cpp
@@ -52,7 +52,7 @@
 void CreateModel_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type11(Type::TENSOR_QUANT8_ASYMM, {25, 1, 1, 1}, 0.25f, 100);
-  OperandType type12(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {16, 1, 1, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f},0));
+  OperandType type12(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {16, 1, 1, 1}, SymmPerChannelQuantParams({0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f},0));
   OperandType type13(Type::TENSOR_INT32, {16}, 0.0f, 0);
   OperandType type14(Type::TENSOR_QUANT8_ASYMM, {25, 32, 32, 16}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
@@ -150,7 +150,7 @@
 void CreateModel_dynamic_output_shape_channelQuant8(Model *model) {
   OperandType type0(Type::BOOL, {});
   OperandType type11(Type::TENSOR_QUANT8_ASYMM, {25, 1, 1, 1}, 0.25f, 100);
-  OperandType type12(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {16, 1, 1, 1}, 0.0f, 0, SymmPerChannelQuantParams({0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f},0));
+  OperandType type12(Type::TENSOR_QUANT8_SYMM_PER_CHANNEL, {16, 1, 1, 1}, SymmPerChannelQuantParams({0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f},0));
   OperandType type13(Type::TENSOR_INT32, {16}, 0.0f, 0);
   OperandType type16(Type::TENSOR_QUANT8_ASYMM, {0, 0, 0, 0}, 0.5f, 80);
   OperandType type4(Type::TENSOR_INT32, {4});
diff --git a/runtime/test/specs/V1_2/conv2d_per_channel.mod.py b/runtime/test/specs/V1_2/conv2d_per_channel.mod.py
index 8780b48..2d2300a 100644
--- a/runtime/test/specs/V1_2/conv2d_per_channel.mod.py
+++ b/runtime/test/specs/V1_2/conv2d_per_channel.mod.py
@@ -15,7 +15,7 @@
 
 # TEST 1: No layout param specified
 i1 = Input("op1", "TENSOR_QUANT8_ASYMM", "{1, 3, 1, 2}, 0.5f, 128")
-f1 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{3, 1, 1, 2}, 0.0f, 0",
+f1 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{3, 1, 1, 2}",
                [1, 2, 1, 2, 1, 2], extraParams = SymmPerChannelQuantParams(channelDim=0, scales=[0.5, 0.75, 1.0]))
 b1 = Parameter("op3", "TENSOR_INT32", "{3}", [4, 4, 4])
 o1 = Output("op4", "TENSOR_QUANT8_ASYMM", "{1, 3, 1, 3}, 1.f, 128")
@@ -30,7 +30,7 @@
 # TEST 2: layout param, NHWC/NCHW layouts
 layout = BoolScalar("layout", False) # NHWC
 i2 = Input("op1", "TENSOR_QUANT8_ASYMM", "{1, 3, 1, 2}, 0.5f, 128")
-f2 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{3, 1, 1, 2}, 0.0f, 0",
+f2 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{3, 1, 1, 2}",
                [1, 2, 1, 2, 1, 2], extraParams = SymmPerChannelQuantParams(channelDim=0, scales=[0.5, 0.75, 1.0]))
 b2 = Parameter("op3", "TENSOR_INT32", "{3}", [4, 4, 4])
 o2 = Output("op4", "TENSOR_QUANT8_ASYMM", "{1, 3, 1, 3}, 1.f, 128")
@@ -59,7 +59,7 @@
 model = model.Operation("ROI_ALIGN", i1, tmp1, tmp2, 2, 2, 2.0, 2.0, 4, 4, layout).To(zero_sized)
 
 # CONV_2D op with numBatches = 0.
-w = Parameter("weights", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{3, 1, 1, 2}, 0.0f, 0",
+w = Parameter("weights", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{3, 1, 1, 2}",
               [1, 2, 1, 2, 1, 2], extraParams = SymmPerChannelQuantParams(channelDim=0, scales=[0.5, 0.75, 1.0]))
 b = Parameter("bias", "TENSOR_INT32", "{3}", [4, 4, 4])
 o3 = Output("out", "TENSOR_QUANT8_ASYMM", "{0, 2, 2, 3}, 1.f, 128") # out
diff --git a/runtime/test/specs/V1_2/depthwise_conv2d_per_channel.mod.py b/runtime/test/specs/V1_2/depthwise_conv2d_per_channel.mod.py
index 2df79ee..55cdaa7 100644
--- a/runtime/test/specs/V1_2/depthwise_conv2d_per_channel.mod.py
+++ b/runtime/test/specs/V1_2/depthwise_conv2d_per_channel.mod.py
@@ -15,7 +15,7 @@
 
 # TEST 1: Same scales, zeroPoint = 0
 i1 = Input("op1", "TENSOR_QUANT8_ASYMM", "{1, 2, 2, 2}, 0.5f, 0")
-f1 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{1, 2, 2, 2}, 0.0f, 0",
+f1 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{1, 2, 2, 2}",
                [2, 4,  2, 0,  2, 2,  2, 0],
                extraParams = SymmPerChannelQuantParams(channelDim=3, scales=[0.5, 0.5]))
 b1 = Parameter("op3", "TENSOR_INT32", "{2}", [0, 0])
@@ -31,7 +31,7 @@
 
 # TEST 2: Different scales, zeroPoint=128
 i2 = Input("op1", "TENSOR_QUANT8_ASYMM", "{1, 3, 3, 2}, 0.5f, 128")
-f2 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{1, 2, 2, 4}, 0.0f, 0",
+f2 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{1, 2, 2, 4}",
                [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
                extraParams = SymmPerChannelQuantParams(channelDim=3, scales=[1.0, 0.5, 1.0, 0.5]))
 b2 = Parameter("op3", "TENSOR_INT32", "{4}", [4, 4, 4, 4])
@@ -50,7 +50,7 @@
 
 # TEST 3: With layout param
 i3 = Input("op1", "TENSOR_QUANT8_ASYMM", "{1, 3, 3, 2}, 0.5f, 128")
-f3 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{1, 2, 2, 4}, 0.0f, 0",
+f3 = Parameter("op2", "TENSOR_QUANT8_SYMM_PER_CHANNEL", "{1, 2, 2, 4}",
                [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
                extraParams = SymmPerChannelQuantParams(channelDim=3, scales=[1.0, 0.5, 1.0, 0.5]))
 b3 = Parameter("op3", "TENSOR_INT32", "{4}", [4, 4, 4, 4])
diff --git a/tools/test_generator/cts_generator.py b/tools/test_generator/cts_generator.py
index 2d6ce9b..7edf877 100755
--- a/tools/test_generator/cts_generator.py
+++ b/tools/test_generator/cts_generator.py
@@ -142,9 +142,13 @@
                 typeDef = "OperandType %s(Type::%s, %s, %s, %d);"%(
                     t, t.type, t.GetDimensionsString(), tg.PrettyPrintAsFloat(t.scale), t.zeroPoint)
             else:
-                typeDef = "OperandType %s(Type::%s, %s, %s, %d, %s);"%(
-                    t, t.type, t.GetDimensionsString(), tg.PrettyPrintAsFloat(t.scale), t.zeroPoint,
-                    t.extraParams.GetConstructor())
+                assert t.type == "TENSOR_QUANT8_SYMM_PER_CHANNEL", "Unexpected model configuration. " \
+                                                                   "Extra params are currently expected for " \
+                                                                   "TENSOR_QUANT8_SYMM_PER_CHANNEL operand type. "
+                assert t.scale == 0.0 and t.zeroPoint == 0, "Scale and zero point are always zero for " \
+                                                            "TENSOR_QUANT8_SYMM_PER_CHANNEL operands"
+                typeDef = "OperandType %s(Type::%s, %s, %s);"%(
+                    t, t.type, t.GetDimensionsString(), t.extraParams.GetConstructor())
 
         IndentedPrint(typeDef, file=model_fd)