Merge branch 'unify-transpose-filter' into 'master'

Move matmul weight transpose to filter transpose

See merge request !757

mace/python/tools/converter_tool/base_converter.py

@@ -198,7 +198,6 @@ class TransformerRule(Enum):
     QUANTIZE_NODES = 23
     ADD_QUANTIZE_TENSOR_RANGE = 24
     QUANTIZE_WEIGHTS = 25
-    TRANSPOSE_MATMUL_WEIGHT = 26
 
 
 class ConverterInterface(object):
@@ -349,8 +348,6 @@ class ConverterOption(object):
                 TransformerRule.FOLD_ACTIVATION,
                 TransformerRule.TRANSFORM_GLOBAL_CONV_TO_FC,
                 TransformerRule.RESHAPE_FC_WEIGHT,
-                # Transpose the weight of matmul if necessary
-                TransformerRule.TRANSPOSE_MATMUL_WEIGHT,
                 # Model data format related transformation
                 TransformerRule.TRANSPOSE_FILTERS,
                 TransformerRule.TRANSPOSE_DATA_FORMAT,

mace/python/tools/converter_tool/transformer.py

@@ -64,9 +64,6 @@ class Transformer(base_converter.ConverterInterface):
             TransformerRule.FOLD_BIASADD: self.fold_biasadd,
             TransformerRule.FLATTEN_ATROUS_CONV: self.flatten_atrous_conv,
             TransformerRule.FOLD_ACTIVATION: self.fold_activation,
-            # TODO(liuqi): should move to transpose_filter
-            TransformerRule.TRANSPOSE_MATMUL_WEIGHT:
-                self.transpose_matmul_weight,
             TransformerRule.TRANSPOSE_FILTERS: self.transpose_filters,
             TransformerRule.TRANSPOSE_DATA_FORMAT: self.transpose_data_format,
             TransformerRule.ADD_IN_OUT_TENSOR_INFO:
@@ -1069,6 +1066,8 @@ class Transformer(base_converter.ConverterInterface):
                     filter.dims[:] = filter_data.shape
                     transposed_deconv_filter.add(op.input[1])
 
+            self.transpose_matmul_weight()
+
         return False
 
     def buffer_to_image(self, op, input_idx, input_type):