From 3e36369a5511c3028c30fc820752dc1248bddf5c Mon Sep 17 00:00:00 2001
From: SiCong Li <sicong.li@arm.com>
Date: Tue, 4 Jul 2017 15:02:10 +0100
Subject: COMPMID-358 Implement OpenCL ROI Pooling

* Implement OpenCL ROI Pooling
* Add CLROIPoolingLayer benchmarks

Change-Id: I8786d01d551850a1b4d599a48fabe3925e0a27d0
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79833
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
---
 tests/validation/NEON/Gaussian5x5.cpp     |  2 --
 tests/validation/NEON/ROIPoolingLayer.cpp | 12 +++++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/validation/NEON')

diff --git a/tests/validation/NEON/Gaussian5x5.cpp b/tests/validation/NEON/Gaussian5x5.cpp
index 522ececee9..7727340f66 100644
--- a/tests/validation/NEON/Gaussian5x5.cpp
+++ b/tests/validation/NEON/Gaussian5x5.cpp
@@ -41,8 +41,6 @@
 
 #include "boost_wrapper.h"
 
-#include <iostream>
-
 #include <random>
 #include <string>
 
diff --git a/tests/validation/NEON/ROIPoolingLayer.cpp b/tests/validation/NEON/ROIPoolingLayer.cpp
index 5775db7e03..523885d908 100644
--- a/tests/validation/NEON/ROIPoolingLayer.cpp
+++ b/tests/validation/NEON/ROIPoolingLayer.cpp
@@ -22,13 +22,12 @@
  * SOFTWARE.
  */
 #include "NEON/Accessor.h"
-#include "NEON/Helper.h"
+#include "NEON/ArrayAccessor.h"
 #include "TypePrinter.h"
 #include "arm_compute/runtime/NEON/functions/NEROIPoolingLayer.h"
 #include "tests/Globals.h"
 #include "tests/Utils.h"
 #include "validation/Datasets.h"
-#include "validation/Helpers.h"
 #include "validation/Reference.h"
 #include "validation/Validation.h"
 #include "validation/ValidationUserConfiguration.h"
@@ -51,9 +50,12 @@ Tensor compute_roi_pooling_layer(const TensorShape &shape, DataType dt, const st
     shape_dst.set(3, rois.size());
 
     // Create tensors
-    Tensor     src        = create_tensor<Tensor>(shape, dt);
-    Tensor     dst        = create_tensor<Tensor>(shape_dst, dt);
-    Array<ROI> rois_array = create_array(rois);
+    Tensor src = create_tensor<Tensor>(shape, dt);
+    Tensor dst = create_tensor<Tensor>(shape_dst, dt);
+
+    // Create ROI array
+    Array<ROI> rois_array(rois.size());
+    fill_array(ArrayAccessor<ROI>(rois_array), rois);
 
     // Create and configure function
     NEROIPoolingLayer roi_pool;
-- 
cgit v1.2.1