diff options
| author | Manuel Bottini <manuel.bottini@arm.com> | 2019-01-09 17:04:39 +0000 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-01-11 15:17:31 +0000 |
| commit | cc5171b85654b9f19a5f52bbe8abea0572ee0163 (patch) | |
| tree | 032999b06aeced4f5e2963ab60c833acb951c3c8 /src/runtime | |
| parent | 587708b05ca63fa88118daec82e2c39d63e60086 (diff) | |
| download | ComputeLibrary-cc5171b85654b9f19a5f52bbe8abea0572ee0163.tar.gz | |
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>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/CL/functions/CLROIPoolingLayer.cpp | 4 | ||||
| -rw-r--r-- | src/runtime/NEON/functions/NEROIPoolingLayer.cpp | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/runtime/CL/functions/CLROIPoolingLayer.cpp b/src/runtime/CL/functions/CLROIPoolingLayer.cpp index 0f480eeac9..7bb41784ac 100644 --- a/src/runtime/CL/functions/CLROIPoolingLayer.cpp +++ b/src/runtime/CL/functions/CLROIPoolingLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -30,7 +30,7 @@ using namespace arm_compute; -void CLROIPoolingLayer::configure(const ICLTensor *input, const ICLROIArray *rois, ICLTensor *output, const ROIPoolingLayerInfo &pool_info) +void CLROIPoolingLayer::configure(const ICLTensor *input, const ICLTensor *rois, ICLTensor *output, const ROIPoolingLayerInfo &pool_info) { // Configure ROI pooling kernel auto k = arm_compute::support::cpp14::make_unique<CLROIPoolingLayerKernel>(); diff --git a/src/runtime/NEON/functions/NEROIPoolingLayer.cpp b/src/runtime/NEON/functions/NEROIPoolingLayer.cpp index 1f1400cf42..3aca4b7b60 100644 --- a/src/runtime/NEON/functions/NEROIPoolingLayer.cpp +++ b/src/runtime/NEON/functions/NEROIPoolingLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -27,14 +27,14 @@ #include "arm_compute/core/NEON/kernels/NEROIPoolingLayerKernel.h" #include "arm_compute/runtime/NEON/NEScheduler.h" -using namespace arm_compute; - +namespace arm_compute +{ NEROIPoolingLayer::NEROIPoolingLayer() : _roi_kernel() { } -void NEROIPoolingLayer::configure(const ITensor *input, const IROIArray *rois, ITensor *output, const ROIPoolingLayerInfo &pool_info) +void NEROIPoolingLayer::configure(const ITensor *input, const ITensor *rois, ITensor *output, const ROIPoolingLayerInfo &pool_info) { _roi_kernel.configure(input, rois, output, pool_info); } @@ -43,3 +43,4 @@ void NEROIPoolingLayer::run() { NEScheduler::get().schedule(&_roi_kernel, Window::DimX); } +} // namespace arm_compute
\ No newline at end of file |