commit a437638028c216a03572593b9d4e3532df2a308d
author Anthony Barbier <anthony.barbier@arm.com> Wed Apr 12 15:12:46 2017 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Wed Apr 12 17:42:01 2017 +0100
tree b2aeef6797fdc620419431b4b3d3c4f46febf69e
parent 68a98dc29106a4c8c34e8cac542fe0bdad4ad531

arm_compute v17.04

src/runtime/NEON/functions/NEScale.cpp

diff --git a/src/runtime/NEON/functions/NEScale.cpp b/src/runtime/NEON/functions/NEScale.cpp
index bd8cf3a..b70f626 100644
--- a/src/runtime/NEON/functions/NEScale.cpp
+++ b/src/runtime/NEON/functions/NEScale.cpp
@@ -41,7 +41,7 @@
 
 namespace
 {
-void precompute_dx_dy_offsets(ITensor *dx, ITensor *dy, ITensor *offsets, float wr, float hr, size_t input_stride, size_t input_element_size)
+void precompute_dx_dy_offsets(ITensor *dx, ITensor *dy, ITensor *offsets, float wr, float hr, size_t input_element_size)
 {
     ARM_COMPUTE_ERROR_ON(nullptr == offsets);
 
@@ -63,7 +63,7 @@
             const int   in_xi = std::floor(in_x);
             const int   in_yi = std::floor(in_y);
 
-            *reinterpret_cast<int32_t *>(offsets_it.ptr()) = in_xi * input_element_size + in_yi * input_stride;
+            *reinterpret_cast<int32_t *>(offsets_it.ptr()) = in_xi * input_element_size;
             *reinterpret_cast<float *>(dx_it.ptr())        = in_x - in_xi;
             *reinterpret_cast<float *>(dy_it.ptr())        = in_y - in_yi;
         },
@@ -77,9 +77,8 @@
         execute_window_loop(win, [&](const Coordinates & id)
         {
             const size_t in_xi = (id.x() + 0.5f) * wr;
-            const size_t in_yi = (id.y() + 0.5f) * hr;
 
-            *reinterpret_cast<int32_t *>(offsets_it.ptr()) = in_xi * input_element_size + in_yi * input_stride;
+            *reinterpret_cast<int32_t *>(offsets_it.ptr()) = in_xi * input_element_size;
         },
         offsets_it);
     }
@@ -108,8 +107,7 @@
     const auto wr = static_cast<float>(input->info()->dimension(0)) / static_cast<float>(output->info()->dimension(0));
     const auto hr = static_cast<float>(input->info()->dimension(1)) / static_cast<float>(output->info()->dimension(1));
 
-    // Get the input stride and the input element size
-    const size_t input_stride       = input->info()->strides_in_bytes()[1];
+    // Get the element size of the input image
     const size_t input_element_size = input->info()->element_size();
 
     // Area interpolation behaves as Nearest Neighbour in case of up-sampling
@@ -128,7 +126,6 @@
         case InterpolationPolicy::NEAREST_NEIGHBOR:
         {
             TensorInfo tensor_info_offsets(shape, Format::S32);
-            tensor_info_offsets.auto_padding();
             _offsets.allocator()->init(tensor_info_offsets);
 
             k->configure(input, nullptr, nullptr, &_offsets, output, policy, border_undefined);
@@ -137,7 +134,7 @@
             _offsets.allocator()->allocate();
 
             // Pre-compute offsets for nearest interpolation
-            precompute_dx_dy_offsets(nullptr, nullptr, &_offsets, wr, hr, input_stride, input_element_size);
+            precompute_dx_dy_offsets(nullptr, nullptr, &_offsets, wr, hr, input_element_size);
             break;
         }
         case InterpolationPolicy::BILINEAR:
@@ -145,9 +142,6 @@
             TensorInfo tensor_info_offsets(shape, Format::S32);
             TensorInfo tensor_info_dxdy(shape, Format::F32);
 
-            tensor_info_offsets.auto_padding();
-            tensor_info_dxdy.auto_padding();
-
             _offsets.allocator()->init(tensor_info_offsets);
             _dx.allocator()->init(tensor_info_dxdy);
             _dy.allocator()->init(tensor_info_dxdy);
@@ -160,7 +154,7 @@
             _dy.allocator()->allocate();
 
             // Pre-compute dx, dy and offsets for bilinear interpolation
-            precompute_dx_dy_offsets(&_dx, &_dy, &_offsets, wr, hr, input_stride, input_element_size);
+            precompute_dx_dy_offsets(&_dx, &_dy, &_offsets, wr, hr, input_element_size);
             break;
         }
         case InterpolationPolicy::AREA: