COMPMID-540 Replace NEDeconvolutionLayerUpsampleKernel with NEScaleKernel

Change-Id: Ic29557cca24447ef40fa2cfca84f208b4d43f8de
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/122180
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele DiGiorgio <michele.digiorgio@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>

2 files changed, 79 insertions, 1 deletions

diff --git a/arm_compute/core/CPP/CPPKernels.h b/arm_compute/core/CPP/CPPKernels.h
index f55f41b0eb..a0c5707a79 100644
--- a/arm_compute/core/CPP/CPPKernels.h
+++ b/arm_compute/core/CPP/CPPKernels.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 ARM Limited.
+ * Copyright (c) 2017-2018 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -29,5 +29,6 @@
 #include "arm_compute/core/CPP/kernels/CPPDetectionWindowNonMaximaSuppressionKernel.h"
 #include "arm_compute/core/CPP/kernels/CPPPermuteKernel.h"
 #include "arm_compute/core/CPP/kernels/CPPSortEuclideanDistanceKernel.h"
+#include "arm_compute/core/CPP/kernels/CPPUpsampleKernel.h"
 
 #endif /* __ARM_COMPUTE_CPPKERNELS_H__ */
diff --git a/arm_compute/core/CPP/kernels/CPPUpsampleKernel.h b/arm_compute/core/CPP/kernels/CPPUpsampleKernel.h
new file mode 100644
index 0000000000..e814c76c7d
--- /dev/null
+++ b/arm_compute/core/CPP/kernels/CPPUpsampleKernel.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2017-2018 ARM Limited.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+#ifndef __ARM_COMPUTE_CPPUPSAMPLEKERNEL_H__
+#define __ARM_COMPUTE_CPPUPSAMPLEKERNEL_H__
+
+#include "arm_compute/core/CPP/ICPPKernel.h"
+
+namespace arm_compute
+{
+class ITensor;
+
+/** CPP kernel to perform tensor upsample.
+ *
+ */
+class CPPUpsampleKernel : public ICPPKernel
+{
+public:
+    const char *name() const override
+    {
+        return "CPPUpsampleKernel";
+    }
+    /** Default constructor */
+    CPPUpsampleKernel();
+    /** Prevent instances of this class from being copied (As this class contains pointers) */
+    CPPUpsampleKernel(const CPPUpsampleKernel &) = delete;
+    /** Prevent instances of this class from being copied (As this class contains pointers) */
+    CPPUpsampleKernel &operator=(const CPPUpsampleKernel &) = delete;
+    /** Allow instances of this class to be moved */
+    CPPUpsampleKernel(CPPUpsampleKernel &&) = default;
+    /** Allow instances of this class to be moved */
+    CPPUpsampleKernel &operator=(CPPUpsampleKernel &&) = default;
+    /** Default destructor */
+    ~CPPUpsampleKernel() = default;
+
+    /** Set the input and output of the kernel.
+     *
+     * @param[in]  input              The input tensor to upsample. Data types supported: F32
+     * @param[out] output             The output tensor. Data types supported: Same as @p input
+     * @param[in]  info               Padding info.
+     * @param[in]  inner_border_right The number of zeros added to right edge of the input.
+     * @param[in]  inner_border_top   The number of zeros added to top edge of the input.
+     */
+    void configure(const ITensor *input, ITensor *output, const PadStrideInfo &info, unsigned int inner_border_right, unsigned int inner_border_top);
+
+    // Inherited methods overridden:
+    void run(const Window &window, const ThreadInfo &info) override;
+    bool is_parallelisable() const override;
+
+private:
+    const ITensor *_input;
+    ITensor       *_output;
+    PadStrideInfo  _info;
+    std::pair<unsigned int, unsigned int> _inner_border;
+};
+} // namespace arm_compute
+#endif /*__ARM_COMPUTE_CPPUPSAMPLEKERNEL_H__ */