mypy

Author: shumaari

nncf/common/graph/utils.py

@@ -146,13 +146,10 @@ def get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes) -> List[i
     :param layer_attributes: layer attributes of NNCFNode.
     :return: weights shape layout.
     """
-    if isinstance(layer_attributes, GenericWeightedLayerAttributes):
-        return layer_attributes.weight_shape
-
     if isinstance(layer_attributes, LinearLayerAttributes):
         return [layer_attributes.out_features, layer_attributes.in_features]
 
-    if isinstance(layer_attributes, ConvolutionLayerAttributes):
+    elif isinstance(layer_attributes, ConvolutionLayerAttributes):
         if not layer_attributes.transpose:
             return [
                 layer_attributes.out_channels,
@@ -165,9 +162,13 @@ def get_weight_shape_legacy(layer_attributes: WeightedLayerAttributes) -> List[i
             *layer_attributes.kernel_size,
         ]
 
-    if isinstance(layer_attributes, GroupNormLayerAttributes):
+    elif isinstance(layer_attributes, GroupNormLayerAttributes):
         return [layer_attributes.num_channels]
 
+    else:
+        assert isinstance(layer_attributes, GenericWeightedLayerAttributes):
+        return layer_attributes.weight_shape
+
 
 def get_target_dim_for_compression_legacy(layer_attributes: WeightedLayerAttributes) -> int:
     """
@@ -176,15 +177,17 @@ def get_target_dim_for_compression_legacy(layer_attributes: WeightedLayerAttribu
     :param layer_attributes: layer attributes of NNCFNode.
     :return: target dim for compression.
     """
-    if isinstance(layer_attributes, (GenericWeightedLayerAttributes, LinearLayerAttributes, GroupNormLayerAttributes)):
-        return 0
-
     if isinstance(layer_attributes, ConvolutionLayerAttributes):
         # Always quantize per each "out" channel
         if layer_attributes.transpose:
             return 1
         return 0
 
+    else:
+        assert isinstance(layer_attributes, (GenericWeightedLayerAttributes, LinearLayerAttributes, GroupNormLayerAttributes)):
+        return 0
+
+
 
 def get_bias_shape_legacy(layer_attributes: WeightedLayerAttributes) -> int:
     """
@@ -193,8 +196,11 @@ def get_bias_shape_legacy(layer_attributes: WeightedLayerAttributes) -> int:
     :param layer_attributes: layer attributes of NNCFNode.
     :return: bias shape.
     """
-    if isinstance(layer_attributes, LinearLayerAttributes):
-        return layer_attributes.out_features if layer_attributes.with_bias is True else 0
+    if isinstance(layer_attributes, LinearLayerAttributes) and layer_attributes.with_bias:
+        return layer_attributes.out_features
+
+    else:
+        return 0
 
 
 def get_num_filters_legacy(layer_attributes: WeightedLayerAttributes) -> int: