COMPMID-1677: Change ROIPooling layer interface to accept ROIs as tensors

Change-Id: If16b572a4d906187b77f32133a72a44316fa74e4
Reviewed-on: https://review.mlplatform.org/490
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>

2 files changed, 7 insertions, 136 deletions

diff --git a/tests/datasets/ROIAlignLayerDataset.h b/tests/datasets/ROIDataset.h
index 27c6ee4d91..9e21ab119c 100644
--- a/tests/datasets/ROIAlignLayerDataset.h
+++ b/tests/datasets/ROIDataset.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -35,7 +35,7 @@ namespace test
 {
 namespace datasets
 {
-class ROIAlignLayerDataset
+class ROIDataset
 {
 public:
     using type = std::tuple<TensorShape, ROIPoolingLayerInfo, TensorShape>;
@@ -60,7 +60,7 @@ public:
             return description.str();
         }
 
-        ROIAlignLayerDataset::type operator*() const
+        ROIDataset::type operator*() const
         {
             return std::make_tuple(*_tensor_shape_it, *_infos_it, *_rois_shape_it);
         }
@@ -98,8 +98,8 @@ public:
     }
 
 protected:
-    ROIAlignLayerDataset()                        = default;
-    ROIAlignLayerDataset(ROIAlignLayerDataset &&) = default;
+    ROIDataset()              = default;
+    ROIDataset(ROIDataset &&) = default;
 
 private:
     std::vector<TensorShape>         _tensor_shapes{};
@@ -107,10 +107,10 @@ private:
     std::vector<TensorShape>         _rois_shape{};
 };
 
-class SmallROIAlignLayerDataset final : public ROIAlignLayerDataset
+class SmallROIDataset final : public ROIDataset
 {
 public:
-    SmallROIAlignLayerDataset()
+    SmallROIDataset()
     {
         add_config(TensorShape(50U, 47U, 1U, 1U), ROIPoolingLayerInfo(7U, 7U, 1.f / 4.f), TensorShape(5U, 1U));
         add_config(TensorShape(50U, 47U, 3U, 4U), ROIPoolingLayerInfo(7U, 7U, 1.f / 4.f), TensorShape(5U, 1U));
diff --git a/tests/datasets/ROIPoolingLayerDataset.h b/tests/datasets/ROIPoolingLayerDataset.h
deleted file mode 100644
index eb1d165202..0000000000
--- a/tests/datasets/ROIPoolingLayerDataset.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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_TEST_ROI_POOLING_LAYER_DATASET
-#define ARM_COMPUTE_TEST_ROI_POOLING_LAYER_DATASET
-
-#include "utils/TypePrinter.h"
-
-#include "arm_compute/core/TensorShape.h"
-#include "arm_compute/core/Types.h"
-
-namespace arm_compute
-{
-namespace test
-{
-namespace datasets
-{
-class ROIPoolingLayerDataset
-{
-public:
-    using type = std::tuple<TensorShape, ROIPoolingLayerInfo, int>;
-
-    struct iterator
-    {
-        iterator(std::vector<TensorShape>::const_iterator         tensor_shape_it,
-                 std::vector<ROIPoolingLayerInfo>::const_iterator infos_it,
-                 std::vector<unsigned int>::const_iterator        num_rois_it)
-            : _tensor_shape_it{ std::move(tensor_shape_it) },
-              _infos_it{ std::move(infos_it) },
-              _num_rois_it{ std::move(num_rois_it) }
-        {
-        }
-
-        std::string description() const
-        {
-            std::stringstream description;
-            description << "In=" << *_tensor_shape_it << ":";
-            description << "Info=" << *_infos_it << ":";
-            description << "NumROIS=" << *_num_rois_it;
-            return description.str();
-        }
-
-        ROIPoolingLayerDataset::type operator*() const
-        {
-            return std::make_tuple(*_tensor_shape_it, *_infos_it, *_num_rois_it);
-        }
-
-        iterator &operator++()
-        {
-            ++_tensor_shape_it;
-            ++_infos_it;
-            ++_num_rois_it;
-
-            return *this;
-        }
-
-    private:
-        std::vector<TensorShape>::const_iterator         _tensor_shape_it;
-        std::vector<ROIPoolingLayerInfo>::const_iterator _infos_it;
-        std::vector<unsigned int>::const_iterator        _num_rois_it;
-    };
-
-    iterator begin() const
-    {
-        return iterator(_tensor_shapes.begin(), _infos.begin(), _num_rois.begin());
-    }
-
-    int size() const
-    {
-        return std::min(std::min(_tensor_shapes.size(), _infos.size()), _num_rois.size());
-    }
-
-    void add_config(TensorShape tensor_shape, ROIPoolingLayerInfo info, unsigned int num_rois)
-    {
-        _tensor_shapes.emplace_back(std::move(tensor_shape));
-        _infos.emplace_back(std::move(info));
-        _num_rois.emplace_back(std::move(num_rois));
-    }
-
-protected:
-    ROIPoolingLayerDataset()                          = default;
-    ROIPoolingLayerDataset(ROIPoolingLayerDataset &&) = default;
-
-private:
-    std::vector<TensorShape>         _tensor_shapes{};
-    std::vector<ROIPoolingLayerInfo> _infos{};
-    std::vector<unsigned int>        _num_rois{};
-};
-
-class SmallROIPoolingLayerDataset final : public ROIPoolingLayerDataset
-{
-public:
-    SmallROIPoolingLayerDataset()
-    {
-        add_config(TensorShape(50U, 47U, 1U), ROIPoolingLayerInfo(7U, 7U, 1.f / 8.f), 1U);
-        add_config(TensorShape(50U, 47U, 3U), ROIPoolingLayerInfo(7U, 7U, 1.f / 8.f), 1U);
-        add_config(TensorShape(50U, 47U, 3U), ROIPoolingLayerInfo(7U, 7U, 1.f / 8.f), 40U);
-        add_config(TensorShape(50U, 47U, 10U), ROIPoolingLayerInfo(7U, 7U, 1.f / 8.f), 80U);
-        add_config(TensorShape(50U, 47U, 80U), ROIPoolingLayerInfo(7U, 7U, 1.f / 8.f), 80U);
-        add_config(TensorShape(50U, 47U, 3U), ROIPoolingLayerInfo(9U, 9U, 1.f / 8.f), 40U);
-        add_config(TensorShape(50U, 47U, 10U), ROIPoolingLayerInfo(9U, 9U, 1.f / 8.f), 80U);
-        add_config(TensorShape(50U, 47U, 80U), ROIPoolingLayerInfo(9U, 9U, 1.f / 8.f), 80U);
-    }
-};
-
-} // namespace datasets
-} // namespace test
-} // namespace arm_compute
-#endif /* ARM_COMPUTE_TEST_ROI_POOLING_LAYER_DATASET */