commit e1651a55c637708347c9adda4a77f1deffacf7d2
author Michalis Spyrou <michalis.spyrou@arm.com> Thu Jul 11 15:00:49 2019 +0100
committer Michalis Spyrou <michalis.spyrou@arm.com> Fri Jul 12 09:29:37 2019 +0000
tree ad58c09a1a9b141b17ad108799b70727df3c1667
parent bffb41e06c1276af00e1605ef934d05fa61f7127

COMPMID-2414 Add add_2D_tensor_argument_if for OpenCL

Change-Id: I8675b4b4face0be9416ae6c7a7023234d50fc0cb
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1524
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>

src/core/CL/kernels/CLSpaceToBatchLayerKernel.cpp

diff --git a/src/core/CL/kernels/CLSpaceToBatchLayerKernel.cpp b/src/core/CL/kernels/CLSpaceToBatchLayerKernel.cpp
index f039198..1492f34 100644
--- a/src/core/CL/kernels/CLSpaceToBatchLayerKernel.cpp
+++ b/src/core/CL/kernels/CLSpaceToBatchLayerKernel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -192,13 +192,12 @@
     int batch_id = 0;
     do
     {
-        unsigned int idx = 0;
+        unsigned int idx  = 0;
+        const bool   cond = (_paddings != nullptr && _block_shape != nullptr);
         add_4D_tensor_argument(idx, _input, slice_in);
-        if(_paddings != nullptr && _block_shape != nullptr)
-        {
-            add_2D_tensor_argument(idx, _paddings, padding_slice);
-            add_1D_tensor_argument(idx, _block_shape, vector_slice);
-        }
+        add_2D_tensor_argument_if(cond, idx, _paddings, padding_slice);
+        add_1D_tensor_argument_if(cond, idx, _block_shape, vector_slice);
+
         add_argument(idx, batch_id);
         add_3D_tensor_argument(idx, _output, slice_out);
         enqueue(queue, *this, slice_out);