commit f995db7b503eb2e5690972d95f40b96199c5555c
author Dwight Lidman <dwight.lidman@arm.com> Mon Apr 27 11:15:12 2020 +0200
committer Tim Hall <tim.hall@arm.com> Thu Jun 18 17:53:52 2020 +0100
tree f6cb2451a8a0a2c2be8a8b13c2c33d0613c0e49d
parent d67c0aaccd91f4be3ea76f69fa063301ffc73aa3

MLBEDSW-2001: Fix unary elementwise operator regression

Change-Id: I8f109cd148aaa17c18a97068fad52419c8d9d12e
Signed-off-by: Dwight Lidman <dwight.lidman@arm.com>

ethosu/vela/supported_operators.py

diff --git a/ethosu/vela/supported_operators.py b/ethosu/vela/supported_operators.py
index 23135f8..fb3061f 100644
--- a/ethosu/vela/supported_operators.py
+++ b/ethosu/vela/supported_operators.py
@@ -45,9 +45,10 @@
             # RNN/LSTM/GRU
             | set(("BlockLSTM"))
         )
-        self.elem_wise_main_ops = set(
+        self.unary_elem_wise_main_ops = set(("LeakyRelu", "Abs"))
+        self.binary_elem_wise_main_ops = set(
             (
-                # element-wise
+                # binary element-wise
                 "AddAct",
                 "MulAct",
                 "SubAct",
@@ -61,6 +62,7 @@
                 "Maximum",
             )
         )
+        self.elem_wise_main_ops = self.binary_elem_wise_main_ops | self.unary_elem_wise_main_ops
         self.activation_ops = set(
             ("QuantizedRelu", "QuantizedRelu1", "QuantizedRelu6", "Relu", "Relu6", "ReluN1To1", "Sigmoid", "Tanh")
         )
@@ -223,16 +225,18 @@
             return False
 
         # check batch size
-        if (len(ifm_tensor.shape) > 2 and ifm_tensor.shape[0] != 1) or (
-            len(ifm2_tensor.shape) > 2 and ifm2_tensor.shape[0] != 1
-        ):
-            return False
+        if len(ifm_tensor.shape) > 2 and ifm_tensor.shape[0] != 1:
+                return False
+        if op.type in self.binary_elem_wise_main_ops: # if op type is unary, ifm2_tensor is None
+            if len(ifm2_tensor.shape) > 2 and ifm2_tensor.shape[0] != 1:
+                return False
 
         # check scalar size
-        if (hasattr(ifm_tensor.values, "__len__") and len(ifm_tensor.values) > 1) or (
-            hasattr(ifm2_tensor.values, "__len__") and len(ifm2_tensor.values) > 1
-        ):
+        if hasattr(ifm_tensor.values, "__len__") and len(ifm_tensor.values) > 1:
             return False
+        if op.type in self.binary_elem_wise_main_ops: # same as above
+            if hasattr(ifm2_tensor.values, "__len__") and len(ifm2_tensor.values) > 1:
+                return False
         return True
 
     def check_memory_only_restrictions(self, op):