Add constructor parameters: qFC

Author: dboyliao

utensor_cgen/backend/utensor/code_generator/rearch/_operators/_impls.py

@@ -312,7 +312,7 @@ def get_eval_snippet(self, op_var_name, op_info, tensor_var_map):
     )
 
 
-class _DWSConvOps(_Operator):
+class _CommonParams(_Operator):
   _PADDING_MAP = {
     0: "UNKNOWN",
     1: "VALID",
@@ -331,7 +331,7 @@ class _DWSConvOps(_Operator):
 
 
 @OperatorFactory.register
-class _QuantDWSConvOperator(_DWSConvOps):
+class _QuantDWSConvOperator(_CommonParams):
   op_type = "QuantizedDepthwiseSeparableConvOperator"
 
   @classmethod
@@ -374,7 +374,7 @@ def get_eval_snippet(self, op_var_name, op_info, tensor_var_map):
 
 
 @OperatorFactory.register
-class _DWSConvOperator(_DWSConvOps):
+class _DWSConvOperator(_CommonParams):
   op_type = "DepthwiseSeparableConvOperator"
 
   @classmethod
@@ -407,9 +407,18 @@ def get_eval_snippet(self, op_var_name, op_info, tensor_var_map):
 
 
 @OperatorFactory.register
-class _QuantizedFullyConnectedOperator(_Operator):
+class _QuantizedFullyConnectedOperator(_CommonParams):
   op_type = "QuantizedFullyConnectedOperator"
 
+  @classmethod
+  @must_return_type(Hashable)
+  def get_constructor_parameters(cls, op_info):
+    activation_idx = cls._ACTIVATION_STR_PATTERN.match(
+      op_info.op_attr['FusedActivationFunction']
+    ).group(1)
+    activation = cls._ACTIVATION_MAP[activation_idx]
+    return (activation,)
+
   def get_declare_snippet(self, op_var_name, tensor_var_map):
     return DeclareOpSnippet(
       op=self,

utensor_cgen/frontend/tflite.py

@@ -290,7 +290,9 @@ def _build_param_ops(self, fb_model, ugraph):
       buffer_array = fb_model.Buffers(buffer_index).DataAsNumpy()
       if isinstance(buffer_array, int):
         continue  # somehow, sometimes, the buffer contains no data, likely to be an intermediate tensor
-      buffer_content = fb_model.Buffers(buffer_index).DataAsNumpy().view(dtype)
+      buffer_content = fb_model.Buffers(buffer_index).DataAsNumpy().view(dtype).reshape(
+        self.tensor_names_map[idx].shape
+      )
 
       OperationInfo(
         name=node_name,
@@ -343,8 +345,8 @@ def _build_intermediate_ops(self, fb_model, ugraph):
       op = subgraph.Operators(i)
       local_op_code = op.OpcodeIndex()
       global_op_code = fb_model.OperatorCodes(local_op_code)
-      builtinOperator_code = global_op_code.BuiltinCode()
-      op_type = self._BUILTIN_OPS[builtinOperator_code]
+      builtin_op_code = global_op_code.BuiltinCode()
+      op_type = self._BUILTIN_OPS[builtin_op_code]
 
       node_name = str(i) + "_" + op_type
 

utensor_cgen/legalizer/tflite.py

@@ -50,7 +50,7 @@ def apply(cls, ugraph):
     for op_info in ugraph.get_ops_by_type('FullyConnected'):
       filter_tensor = op_info.input_tensors[1]
       filter_op = filter_tensor.op
-      np_arr = filter_op.op_attr['value'].value.np_array.reshape(filter_tensor.shape)
+      np_arr = filter_op.op_attr['value'].value.np_array
       filter_op.op_attr['value'].value.np_array = np_arr.T
       filter_tensor.shape = list(np_arr.T.shape)
       filter_op.output_tensors[0].shape = list(np_arr.T.shape)