fixes

src/brevitas/nn/quant_layer.py

@@ -41,7 +41,7 @@ def channelwise_separable(self) -> bool:
 
     @property
     def requires_export_handler(self):
-        return self.quant_input.is_quant_enabled or self.act_quant.is_quant_enabled
+        return self.input_quant.is_quant_enabled or self.act_quant.is_quant_enabled
 
     # @property
     # def is_output_quant_enabled(self):
@@ -87,16 +87,16 @@ def __init__(
         QuantOutputMixin.__init__(self, output_quant, **kwargs)
         # we have to account for quantization being enabled through kwargs
         if tie_input_output_quant:
-            if self.quant_input.is_quant_enabled and self.act_quant.is_quant_enabled:
+            if self.input_quant.is_quant_enabled and self.act_quant.is_quant_enabled:
                 raise RuntimeError("Enable only input or output quant with tie_input_output=True")
-            if self.quant_input.is_quant_enabled:
+            if self.input_quant.is_quant_enabled:
                 self.output_quant = self.input_quant
             if self.act_quant.is_quant_enabled:
                 self.input_quant = self.output_quant
 
     @property
     def requires_export_handler(self):
-        return self.quant_input.is_quant_enabled or self.act_quant.is_quant_enabled
+        return self.input_quant.is_quant_enabled or self.act_quant.is_quant_enabled
 
 
 class QuantWeightBiasInputOutputLayer(QuantBiasMixin, QuantWeightMixin, QuantInputOutputLayer):
@@ -138,8 +138,8 @@ def quant_output_scale_impl(
     @property
     def requires_export_handler(self):
         return (
-            self.quant_input.is_quant_enabled or self.quant_weight.is_quant_enabled or
-            self.quant_bias.is_quant_enabled or self.output_quant.is_quant_enabled)
+            self.input_quant.is_quant_enabled or self.weight_quant.is_quant_enabled or
+            self.bias_quant.is_quant_enabled or self.output_quant.is_quant_enabled)
 
     @property
     def per_elem_ops(self):  # optional, so concrete impl + error if not overridden
@@ -169,7 +169,7 @@ def forward_impl(self, inp: Union[Tensor, QuantTensor]) -> Union[Tensor, QuantTe
         compute_output_quant_tensor = isinstance(quant_input, QuantTensor) and isinstance(
             quant_weight, QuantTensor)
         if not (compute_output_quant_tensor or
-                self.quant_output.is_quant_enabled) and self.return_quant_tensor:
+                self.output_quant.is_quant_enabled) and self.return_quant_tensor:
             raise RuntimeError("QuantLayer is not correctly configured")
 
         if isinstance(quant_input, QuantTensor) and isinstance(quant_weight, QuantTensor):
@@ -205,7 +205,7 @@ def forward_impl(self, inp: Union[Tensor, QuantTensor]) -> Union[Tensor, QuantTe
             output_tensor = self.inner_forward_impl(
                 _unpack_quant_tensor(quant_input), _unpack_quant_tensor(quant_weight), None)
 
-        if not self.quant_output.is_quant_enabled and self.return_quant_tensor:
+        if not self.output_quant.is_quant_enabled and self.return_quant_tensor:
             if compute_output_quant_tensor:
                 if (quant_input.zero_point != 0.0).any() or (quant_weight.zero_point != 0.0).any():
                     raise RuntimeError(

tests/brevitas/nn/test_wbiol.py

@@ -68,19 +68,19 @@ def default_weight_tensor_quant(default_wbiol_layer):
 
 
 def test_default_wbiol_input_quant_enabled(default_wbiol_layer: QuantWBIOL):
-    assert not default_wbiol_layer.quant_input.is_quant_enabled
+    assert not default_wbiol_layer.input_quant.is_quant_enabled
 
 
 def test_default_wbiol_output_quant_enabled(default_wbiol_layer: QuantWBIOL):
-    assert not default_wbiol_layer.quant_output.is_quant_enabled
+    assert not default_wbiol_layer.output_quant.is_quant_enabled
 
 
 def test_default_wbiol_bias_quant_enabled(default_wbiol_layer: QuantWBIOL):
-    assert not default_wbiol_layer.quant_bias.is_quant_enabled
+    assert not default_wbiol_layer.bias_quant.is_quant_enabled
 
 
 def test_default_wbiol_weight_quant_enabled(default_wbiol_layer: QuantWBIOL):
-    assert default_wbiol_layer.quant_weight.is_quant_enabled
+    assert default_wbiol_layer.weight_quant.is_quant_enabled
 
 
 def test_default_wbiol_weight_bit_width_enabled(default_wbiol_layer: QuantWBIOL):
@@ -104,7 +104,7 @@ def test_default_wbiol_quant_bias_narrow_range(default_wbiol_layer: QuantWBIOL):
 
 
 def test_default_wbiol_quant_weight_narrow_range(default_wbiol_layer: QuantWBIOL):
-    assert default_wbiol_layer.quant_weight.is_narrow_range
+    assert default_wbiol_layer.weight_quant.is_narrow_range
 
 
 def test_default_wbiol_quant_input_signed(default_wbiol_layer: QuantWBIOL):
@@ -116,11 +116,11 @@ def test_default_wbiol_quant_output_signed(default_wbiol_layer: QuantWBIOL):
 
 
 def test_default_wbiol_quant_input_narrow_range(default_wbiol_layer: QuantWBIOL):
-    assert default_wbiol_layer.input_quant.is_quant_enabled is None
+    assert default_wbiol_layer.input_quant.is_narrow_range is None
 
 
 def test_default_wbiol_quant_output_narrow_range(default_wbiol_layer: QuantWBIOL):
-    assert default_wbiol_layer.output_quant.narrow_range is None
+    assert default_wbiol_layer.output_quant.is_narrow_range is None
 
 
 def test_default_wbiol_quant_input_zero_point(default_wbiol_layer: QuantWBIOL):