MLBEDSW-5361 - Fix per-axis quantization support
This commit fixes a number of bugs where per-axis
quantization would make Vela crash and would not
be properly recognized.
Signed-off-by: Dwight Lidman <dwight.lidman@arm.com>
Change-Id: I50a461d200274b43ec76f3a7357bf66db6d49964
diff --git a/ethosu/vela/tensor.py b/ethosu/vela/tensor.py
index 2e70d72..d62ebc8 100644
--- a/ethosu/vela/tensor.py
+++ b/ethosu/vela/tensor.py
@@ -270,12 +270,12 @@
def is_valid(self) -> bool:
# quantisation parameters are consider valid if they have a scale and zero point
- return None not in (self.scale_f32, self.zero_point)
+ return self.scale_f32 is not None and self.zero_point is not None
def is_per_axis(self) -> bool:
- """Returns True if either the scale, zero point, minimum or maximum values are arrays"""
+ """Returns True if either the scale, zero point, minimum or maximum values have more than one value"""
for attr in ("scale_f32", "zero_point", "min", "max"):
- if isinstance(getattr(self, attr), np.ndarray):
+ if np.size(getattr(self, attr)) > 1:
return True
return False
diff --git a/ethosu/vela/tflite_model_semantic.py b/ethosu/vela/tflite_model_semantic.py
index 6e2467b..51d1f07 100644
--- a/ethosu/vela/tflite_model_semantic.py
+++ b/ethosu/vela/tflite_model_semantic.py
@@ -282,7 +282,7 @@
"Input and Output tensors must have quantization scales that fit within float32 precision"
if op.ofm is not None and op.ofm.is_quantized():
ofm_scale = op.ofm.quantization.scale_f32
- if ofm_scale < np.finfo(np.float32).tiny:
+ if np.any(ofm_scale < np.finfo(np.float32).tiny):
return (
False,
f"The quantization scale of the output tensor is {ofm_scale}, "
@@ -290,7 +290,7 @@
)
if op.ifm is not None and op.ifm.is_quantized():
ifm_scale = op.ifm.quantization.scale_f32
- if np.isinf(ifm_scale / ofm_scale):
+ if np.any(np.isinf(ifm_scale / ofm_scale)):
return (
False,
f"IFM scale divided by OFM scale is infinite, ifm_scale={ifm_scale} ofm_scale={ofm_scale}",