aboutsummaryrefslogtreecommitdiff
path: root/arm_compute/core
diff options
context:
space:
mode:
authorGeorgios Pinitas <georgios.pinitas@arm.com>2017-06-21 16:44:24 +0100
committerAnthony Barbier <anthony.barbier@arm.com>2018-09-17 14:15:39 +0100
commit7b7858df42fccefbe6eb086ad516d5c011becd07 (patch)
tree92d8671160cd440647b6ee8aa7f949cf9896f6bb /arm_compute/core
parentd0ae8b8ac8a371fd552c46d4b3be3db8628a5ade (diff)
downloadComputeLibrary-7b7858df42fccefbe6eb086ad516d5c011becd07.tar.gz
COMPMID-359: Implement NEON ROIPoolingLayer
Change-Id: Ibffa738d4016d7221968bd43a4e6e1dab85baee8 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/78623 Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com> Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com> Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'arm_compute/core')
-rw-r--r--arm_compute/core/IArray.h2
-rw-r--r--arm_compute/core/NEON/NEKernels.h1
-rw-r--r--arm_compute/core/NEON/kernels/NEROIPoolingLayerKernel.h71
-rw-r--r--arm_compute/core/Types.h40
4 files changed, 114 insertions, 0 deletions
diff --git a/arm_compute/core/IArray.h b/arm_compute/core/IArray.h
index 2ed56100cf..8f84bb182a 100644
--- a/arm_compute/core/IArray.h
+++ b/arm_compute/core/IArray.h
@@ -34,6 +34,7 @@ class KeyPoint;
class Coordinates2D;
class DetectionWindow;
class Size2D;
+class ROI;
/** Array of type T */
template <class T>
@@ -137,6 +138,7 @@ private:
};
using IKeyPointArray = IArray<KeyPoint>;
using ICoordinates2DArray = IArray<Coordinates2D>;
+using IROIArray = IArray<ROI>;
using IDetectionWindowArray = IArray<DetectionWindow>;
using ISize2DArray = IArray<Size2D>;
using IUInt8Array = IArray<uint8_t>;
diff --git a/arm_compute/core/NEON/NEKernels.h b/arm_compute/core/NEON/NEKernels.h
index eaa50f123b..ee63be3c46 100644
--- a/arm_compute/core/NEON/NEKernels.h
+++ b/arm_compute/core/NEON/NEKernels.h
@@ -80,6 +80,7 @@
#include "arm_compute/core/NEON/kernels/NENormalizationLayerKernel.h"
#include "arm_compute/core/NEON/kernels/NEPixelWiseMultiplicationKernel.h"
#include "arm_compute/core/NEON/kernels/NEPoolingLayerKernel.h"
+#include "arm_compute/core/NEON/kernels/NEROIPoolingLayerKernel.h"
#include "arm_compute/core/NEON/kernels/NERemapKernel.h"
#include "arm_compute/core/NEON/kernels/NEScaleKernel.h"
#include "arm_compute/core/NEON/kernels/NEScharr3x3Kernel.h"
diff --git a/arm_compute/core/NEON/kernels/NEROIPoolingLayerKernel.h b/arm_compute/core/NEON/kernels/NEROIPoolingLayerKernel.h
new file mode 100644
index 0000000000..3a2f761370
--- /dev/null
+++ b/arm_compute/core/NEON/kernels/NEROIPoolingLayerKernel.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2017 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_NEROIPOOLINGLAYERKERNEL_H__
+#define __ARM_COMPUTE_NEROIPOOLINGLAYERKERNEL_H__
+
+#include "arm_compute/core/NEON/INEKernel.h"
+
+#include "arm_compute/core/IArray.h"
+
+namespace arm_compute
+{
+class ITensor;
+
+/** Interface for the ROI pooling layer kernel */
+class NEROIPoolingLayerKernel : public INEKernel
+{
+public:
+ /** Default constructor */
+ NEROIPoolingLayerKernel();
+ /** Prevent instances of this class from being copied (As this class contains pointers) */
+ NEROIPoolingLayerKernel(const NEROIPoolingLayerKernel &) = delete;
+ /** Prevent instances of this class from being copied (As this class contains pointers) */
+ NEROIPoolingLayerKernel &operator=(const NEROIPoolingLayerKernel &) = delete;
+ /** Allow instances of this class to be moved */
+ NEROIPoolingLayerKernel(NEROIPoolingLayerKernel &&) = default;
+ /** Allow instances of this class to be moved */
+ NEROIPoolingLayerKernel &operator=(NEROIPoolingLayerKernel &&) = default;
+ /** Default destructor */
+ ~NEROIPoolingLayerKernel() = default;
+
+ /** Set the input and output tensors.
+ *
+ * @param[in] input Source tensor. Data types supported: F32.
+ * @param[in] rois Array containing the regions of interest.
+ * @param[out] output Destination tensor. Data types supported: Same as @p input.
+ * @param[in] pool_info Contains pooling operation information described in @ref ROIPoolingLayerInfo.
+ */
+ void configure(const ITensor *input, const IROIArray *rois, ITensor *output, const ROIPoolingLayerInfo &pool_info);
+
+ // Inherited methods overridden:
+ void run(const Window &window) override;
+
+private:
+ const ITensor *_input;
+ const IROIArray *_rois;
+ ITensor *_output;
+ ROIPoolingLayerInfo _pool_info;
+};
+}
+#endif /*__ARM_COMPUTE_NEROIPOOLINGLAYERKERNEL_H__ */
diff --git a/arm_compute/core/Types.h b/arm_compute/core/Types.h
index b7a30a5634..2bd449c5c6 100644
--- a/arm_compute/core/Types.h
+++ b/arm_compute/core/Types.h
@@ -300,6 +300,13 @@ struct Coordinates3D
uint32_t z; /**< Z coordinates */
};
+/** Region of interest */
+struct ROI
+{
+ Rectangle rect; /**< Rectangle specifying the region of interest */
+ uint16_t batch_idx; /**< The batch index of the region of interest */
+};
+
/** Available channels */
enum class Channel
{
@@ -454,6 +461,39 @@ private:
PadStrideInfo _pad_stride_info;
};
+/** ROI Pooling Layer Information class */
+class ROIPoolingLayerInfo
+{
+public:
+ /** Default Constructor
+ *
+ * @param[in] pooled_width Pooled width of the layer.
+ * @param[in] pooled_height Pooled height of the layer.
+ * @param[in] spatial_scale Spatial scale to be applied to the ROI coordinates and dimensions.
+ */
+ ROIPoolingLayerInfo(unsigned int pooled_width, unsigned int pooled_height, float spatial_scale)
+ : _pooled_width(pooled_width), _pooled_height(pooled_height), _spatial_scale(spatial_scale)
+ {
+ }
+ unsigned int pooled_width() const
+ {
+ return _pooled_width;
+ }
+ unsigned int pooled_height() const
+ {
+ return _pooled_height;
+ }
+ float spatial_scale() const
+ {
+ return _spatial_scale;
+ }
+
+private:
+ unsigned int _pooled_width;
+ unsigned int _pooled_height;
+ float _spatial_scale;
+};
+
/** Activation Layer Information class */
class ActivationLayerInfo
{