aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis Verhaard <louis.verhaard@arm.com>2020-11-16 16:37:11 +0100
committerLouis Verhaard <louis.verhaard@arm.com>2020-11-17 09:59:14 +0100
commit0411edb8947bc2993b1f9498ef43d5b40a2a6305 (patch)
treede323b4c1c1abffd2d4f7b8da0547df0735d2b73
parent15a8e803844b286fe9533e1cf703c76a77b090a8 (diff)
downloadethos-u-vela-0411edb8947bc2993b1f9498ef43d5b40a2a6305.tar.gz
MLBEDSW-3493: bug fixes in mark_tensors
None inputs and unsupported tensor shapes caused asserts when marking tensor purpose/format. Change-Id: I4498b61576f529c1a594341cfbb6ba278c6e7ec5 Signed-off-by: Louis Verhaard <louis.verhaard@arm.com>
-rw-r--r--ethosu/vela/mark_tensors.py2
-rw-r--r--ethosu/vela/tensor.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/ethosu/vela/mark_tensors.py b/ethosu/vela/mark_tensors.py
index 1379628..723bd87 100644
--- a/ethosu/vela/mark_tensors.py
+++ b/ethosu/vela/mark_tensors.py
@@ -59,6 +59,8 @@ def rewrite_mark_tensor_purpose(op, arch):
mark_purpose(tens, arch, TensorPurpose.FeatureMap)
weight_tensors = op.get_weight_tensors()
for tens in op.inputs:
+ if tens is None:
+ continue
if tens.purpose != TensorPurpose.Unknown:
purpose = tens.purpose
elif tens in weight_tensors:
diff --git a/ethosu/vela/tensor.py b/ethosu/vela/tensor.py
index 45518b4..0d299e1 100644
--- a/ethosu/vela/tensor.py
+++ b/ethosu/vela/tensor.py
@@ -446,6 +446,8 @@ class Tensor:
except TypeError:
pass
+ if shape_len > 4:
+ return
self.storage_rounding_quantum = arch.storage_rounding_quantums[self.format]
self.storage_rounding_quantum = self.storage_rounding_quantum[-shape_len:]
self.brick_size = arch.brick_sizes[self.format]