Back to schema version 1 (#1401)

Author: yarden-yagil-sony

model_compression_toolkit/target_platform_capabilities/schema/mct_current_schema.py

@@ -1,4 +1,4 @@
-import model_compression_toolkit.target_platform_capabilities.schema.v2 as schema
+import model_compression_toolkit.target_platform_capabilities.schema.v1 as schema
 
 OperatorSetNames = schema.OperatorSetNames
 Signedness = schema.Signedness

model_compression_toolkit/target_platform_capabilities/schema/v2.py

@@ -30,72 +30,8 @@
     OperatorsSetBase,
     OperatorsSet,
     OperatorSetGroup,
-    Fusing)
-
-
-class OperatorSetNames(str, Enum):
-    CONV = "Conv"
-    DEPTHWISE_CONV = "DepthwiseConv2D"
-    CONV_TRANSPOSE = "ConvTranspose"
-    FULLY_CONNECTED = "FullyConnected"
-    CONCATENATE = "Concatenate"
-    STACK = "Stack"
-    UNSTACK = "Unstack"
-    GATHER = "Gather"
-    EXPAND = "Expend"
-    BATCH_NORM = "BatchNorm"
-    L2NORM = "L2Norm"
-    RELU = "ReLU"
-    RELU6 = "ReLU6"
-    LEAKY_RELU = "LeakyReLU"
-    ELU = "Elu"
-    HARD_TANH = "HardTanh"
-    ADD = "Add"
-    SUB = "Sub"
-    MUL = "Mul"
-    DIV = "Div"
-    MIN = "Min"
-    MAX = "Max"
-    PRELU = "PReLU"
-    ADD_BIAS = "AddBias"
-    SWISH = "Swish"
-    SIGMOID = "Sigmoid"
-    SOFTMAX = "Softmax"
-    LOG_SOFTMAX = "LogSoftmax"
-    TANH = "Tanh"
-    GELU = "Gelu"
-    HARDSIGMOID = "HardSigmoid"
-    HARDSWISH = "HardSwish"
-    FLATTEN = "Flatten"
-    GET_ITEM = "GetItem"
-    RESHAPE = "Reshape"
-    UNSQUEEZE = "Unsqueeze"
-    SQUEEZE = "Squeeze"
-    PERMUTE = "Permute"
-    TRANSPOSE = "Transpose"
-    DROPOUT = "Dropout"
-    SPLIT_CHUNK = "SplitChunk"
-    MAXPOOL = "MaxPool"
-    AVGPOOL = "AvgPool"
-    SIZE = "Size"
-    SHAPE = "Shape"
-    EQUAL = "Equal"
-    ARGMAX = "ArgMax"
-    TOPK = "TopK"
-    FAKE_QUANT = "FakeQuant"
-    COMBINED_NON_MAX_SUPPRESSION = "CombinedNonMaxSuppression"
-    BOX_DECODE = "BoxDecode"
-    ZERO_PADDING2D = "ZeroPadding2D"
-    CAST = "Cast"
-    RESIZE = "Resize"
-    PAD = "Pad"
-    FOLD = "Fold"
-    STRIDED_SLICE = "StridedSlice"
-    SSD_POST_PROCESS = "SSDPostProcess"
-
-    @classmethod
-    def get_values(cls):
-        return [v.value for v in cls]
+    Fusing,
+    OperatorSetNames)
 
 
 class TargetPlatformCapabilities(BaseModel):

model_compression_toolkit/target_platform_capabilities/targetplatform2framework/attach2keras.py

@@ -93,7 +93,6 @@ def __init__(self):
             OperatorSetNames.TOPK: [tf.nn.top_k],
             OperatorSetNames.FAKE_QUANT: [tf.quantization.fake_quant_with_min_max_vars],
             OperatorSetNames.COMBINED_NON_MAX_SUPPRESSION: [tf.image.combined_non_max_suppression],
-            OperatorSetNames.BOX_DECODE: [],  # no such operator in keras
             OperatorSetNames.ZERO_PADDING2D: [ZeroPadding2D],
             OperatorSetNames.CAST: [tf.cast],
             OperatorSetNames.STRIDED_SLICE: [tf.strided_slice],

model_compression_toolkit/target_platform_capabilities/targetplatform2framework/attach2pytorch.py

@@ -98,7 +98,6 @@ def __init__(self):
                                                         Eq('p', 2) | Eq('p', None))],
             OperatorSetNames.SSD_POST_PROCESS: [],  # no such operator in pytorch
             OperatorSetNames.COMBINED_NON_MAX_SUPPRESSION: [],  # no such operator in pytorch
-            OperatorSetNames.BOX_DECODE: []  # no such operator in pytorch
         }
 
         pytorch_linear_attr_mapping = {KERNEL_ATTR: DefaultDict(default_value=PYTORCH_KERNEL),

tests_pytest/_fw_tests_common_base/base_tpc_attach2fw_test.py

@@ -51,7 +51,7 @@ def setup_method(self):
 
     def test_attach2fw_init(self):
         # verify built-in opset to operator mapping structure
-        assert len(self.attach2fw._opset2layer) == 58  # number of built-in operator sets
+        assert len(self.attach2fw._opset2layer) == 57  # number of built-in operator sets
         assert all(opset in self.attach2fw._opset2layer for opset in list(schema.OperatorSetNames))
         assert all(isinstance(key, schema.OperatorSetNames) for key in self.attach2fw._opset2layer.keys())
         assert all(isinstance(value, list) for value in self.attach2fw._opset2layer.values())