commit f3e3ad746de943e312c290d614184c0f6559ac1f
author Michael McGeagh <michael.mcgeagh@arm.com> Wed Dec 02 12:39:03 2020 +0000
committer patrik.gustavsson <patrik.gustavsson@arm.com> Tue Dec 08 14:58:19 2020 +0000
tree 44f6eac5a6b1aec4114ad2c2faddced820ea1e17
parent d9c2c4258c50f04ef3a6c3849508d317249e8ebf

MLBEDSW-2836 Change sets to tuples

Replace conditional checks against sets with tuples.
If not requiring uniqueness, or complex set operations, it is quicker to
use tuples instead.

Signed-off-by: Michael McGeagh <michael.mcgeagh@arm.com>
Change-Id: Ie8732c8d46067244963936c53f0ec81adda50372

ethosu/vela/npu_performance.py

diff --git a/ethosu/vela/npu_performance.py b/ethosu/vela/npu_performance.py
index d28df97..2d7a1b0 100644
--- a/ethosu/vela/npu_performance.py
+++ b/ethosu/vela/npu_performance.py
@@ -45,7 +45,7 @@
     ofm_block = Block(block_config_ps2[-3], block_config_ps2[-4], block_config_ps2[-1])
     kernel = ps2.primary_op.kernel
 
-    if ps2.npu_block_type in set((NpuBlockType.ConvolutionMxN, NpuBlockType.VectorProduct)):
+    if ps2.npu_block_type in (NpuBlockType.ConvolutionMxN, NpuBlockType.VectorProduct):
         op = ps2.primary_op
         ifm_block_depth = arch.calc_ifm_block_depth(op.ifm.shape[-1], op.ifm.dtype.size_in_bits())
     else:
@@ -499,7 +499,7 @@
     ifm_read_multiple = 1
     weight_read_multiple = 0
 
-    if ps.placement in set((PassPlacement.MemoryOnly, PassPlacement.StartupInit)):
+    if ps.placement in (PassPlacement.MemoryOnly, PassPlacement.StartupInit):
         return bws, macs, cycles, blocks, ifm_read_multiple, weight_read_multiple  # nothing real happening in this pass
 
     min_block_size = arch.min_block_sizes[ps.npu_block_type]
@@ -537,13 +537,11 @@
             ifm_block_depth, ofm_block, primary_op.kernel, ifm_resampling_mode=ifm_tensor.resampling_mode
         )
 
-        if npu_block_type in set(
-            (
-                NpuBlockType.ConvolutionMxN,
-                NpuBlockType.ConvolutionDepthWise,
-                NpuBlockType.Pooling,
-                NpuBlockType.ReduceSum,
-            )
+        if npu_block_type in (
+            NpuBlockType.ConvolutionMxN,
+            NpuBlockType.ConvolutionDepthWise,
+            NpuBlockType.Pooling,
+            NpuBlockType.ReduceSum,
         ):
             # extent the ifm to full dimension
             ifm_tensor_brick_size = tuple(numeric_util.full_shape(4, list(ifm_tensor.brick_size), 1))
@@ -640,8 +638,8 @@
             n_kernel_xy = kernel_dims[0] * kernel_dims[1]
             n_input_channels_at_a_time = block_config[2]
 
-            if npu_block_type == NpuBlockType.Pooling or block_traversal in set(
-                (TensorBlockTraversal.PartKernelFirst, TensorBlockTraversal.DepthWise)
+            if (npu_block_type == NpuBlockType.Pooling) or (
+                block_traversal in (TensorBlockTraversal.PartKernelFirst, TensorBlockTraversal.DepthWise)
             ):
                 n_input_channels_at_a_time = numeric_util.round_up_divide(n_input_channels_at_a_time, 4)
                 n_kernel_xy = max(