diff options
author | SiCong Li <sicong.li@arm.com> | 2017-09-12 19:06:28 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
commit | cfb6553e6114fd84e1972b1a5c5cc42784996333 (patch) | |
tree | 8932e23781591c9999613f16ec3b34a2d3890517 | |
parent | 5b61fd3fbaf41031232296abde56258d12ba3340 (diff) | |
download | ComputeLibrary-cfb6553e6114fd84e1972b1a5c5cc42784996333.tar.gz |
COMPMID-417 Fix ROIPooling
* Fix ROIPooling in NEON, CL and Reference.
Change-Id: Id5066625e5073e0bfebe69391f7941e993003296
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/87435
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
-rw-r--r-- | src/core/CL/cl_kernels/roi_pooling_layer.cl | 17 | ||||
-rw-r--r-- | src/core/NEON/kernels/NEROIPoolingLayerKernel.cpp | 12 | ||||
-rw-r--r-- | tests/benchmark/CL/ROIPoolingLayer.cpp | 9 | ||||
-rw-r--r-- | tests/validation_old/CL/ROIPoolingLayer.cpp | 3 | ||||
-rw-r--r-- | tests/validation_old/TensorOperations.h | 12 |
5 files changed, 21 insertions, 32 deletions
diff --git a/src/core/CL/cl_kernels/roi_pooling_layer.cl b/src/core/CL/cl_kernels/roi_pooling_layer.cl index 35a9c0a21f..042b102a15 100644 --- a/src/core/CL/cl_kernels/roi_pooling_layer.cl +++ b/src/core/CL/cl_kernels/roi_pooling_layer.cl @@ -138,24 +138,23 @@ __kernel void roi_pooling_layer( // Load roi parameters // roi is laid out as follows: // { x, y, width, height, batch_index } - const ushort8 roi = vload8(0, (__global ushort *)vector_offset(&rois, pw)); - const int2 roi_anchor = convert_int2_sat(round(convert_float2(roi.s01) * (float)SPATIAL_SCALE)); - const int2 roi_dims = convert_int2_sat(fmax(round(convert_float2(roi.s23) * (float)SPATIAL_SCALE), 1.f)); - - // Determine pooled region in input image to pooled region in output image ratio - const float2 pool_region_ratio = convert_float2(roi_dims) / (float2)(POOLED_DIM_X, POOLED_DIM_Y); + const ushort4 roi = vload4(0, (__global ushort *)vector_offset(&rois, pw)); + const ushort roi_batch = *((__global ushort *)vector_offset(&rois, pw) + 4); + const int2 roi_anchor = convert_int2_sat(round(convert_float2(roi.s01) * (float)SPATIAL_SCALE)); + const int2 roi_dims = convert_int2_sat(fmax(round(convert_float2(roi.s23) * (float)SPATIAL_SCALE), 1.f)); // Calculate pooled region start and end const float2 spatial_indx = (float2)(px, py); + const float2 pooled_dims = (float2)(POOLED_DIM_X, POOLED_DIM_Y); const int2 max_spatial_dims = (int2)(MAX_DIM_X, MAX_DIM_Y); - int2 region_start = convert_int2_sat(floor(spatial_indx * pool_region_ratio)) + roi_anchor; - int2 region_end = convert_int2_sat(ceil((spatial_indx + 1) * pool_region_ratio)) + roi_anchor; + int2 region_start = convert_int2_sat(floor(spatial_indx / pooled_dims * convert_float2(roi_dims))) + roi_anchor; + int2 region_end = convert_int2_sat(floor((spatial_indx + 1) / pooled_dims * convert_float2(roi_dims))) + roi_anchor; region_start = clamp(region_start, 0, max_spatial_dims); region_end = clamp(region_end, 0, max_spatial_dims); // Move input and output pointer across the fourth dimension - input.ptr += roi.s4 * input_stride_w; + input.ptr += roi_batch * input_stride_w; output.ptr += pw * output_stride_w; for(int pz = 0; pz < MAX_DIM_Z; ++pz) diff --git a/src/core/NEON/kernels/NEROIPoolingLayerKernel.cpp b/src/core/NEON/kernels/NEROIPoolingLayerKernel.cpp index 83ab611b67..a209a523d3 100644 --- a/src/core/NEON/kernels/NEROIPoolingLayerKernel.cpp +++ b/src/core/NEON/kernels/NEROIPoolingLayerKernel.cpp @@ -105,10 +105,6 @@ void NEROIPoolingLayerKernel::run(const Window &window, const ThreadInfo &info) const int roi_width = std::max(support::cpp11::round(curr_roi.rect.width * spatial_scale), 1.f); const int roi_height = std::max(support::cpp11::round(curr_roi.rect.height * spatial_scale), 1.f); - // Determine pooling regions - const auto pool_region_size_x = static_cast<float>(roi_width) / pooled_w; - const auto pool_region_size_y = static_cast<float>(roi_height) / pooled_h; - // Iterate through all feature maps for(int fm = 0; fm < fms; ++fm) { @@ -117,10 +113,10 @@ void NEROIPoolingLayerKernel::run(const Window &window, const ThreadInfo &info) { for(int px = 0; px < pooled_w; ++px) { - auto region_start_x = static_cast<int>(std::floor(px * pool_region_size_x)); - auto region_end_x = static_cast<int>(std::ceil((px + 1) * pool_region_size_x)); - auto region_start_y = static_cast<int>(std::floor(py * pool_region_size_y)); - auto region_end_y = static_cast<int>(std::ceil((py + 1) * pool_region_size_y)); + auto region_start_x = static_cast<int>(std::floor((static_cast<float>(px) / pooled_w) * roi_width)); + auto region_end_x = static_cast<int>(std::floor((static_cast<float>(px + 1) / pooled_w) * roi_width)); + auto region_start_y = static_cast<int>(std::floor((static_cast<float>(py) / pooled_h) * roi_height)); + auto region_end_y = static_cast<int>(std::floor((static_cast<float>(py + 1) / pooled_h) * roi_height)); region_start_x = std::min(std::max(region_start_x + roi_anchor_x, 0), width); region_end_x = std::min(std::max(region_end_x + roi_anchor_x, 0), width); diff --git a/tests/benchmark/CL/ROIPoolingLayer.cpp b/tests/benchmark/CL/ROIPoolingLayer.cpp index 186e42c0af..a10134fb04 100644 --- a/tests/benchmark/CL/ROIPoolingLayer.cpp +++ b/tests/benchmark/CL/ROIPoolingLayer.cpp @@ -43,11 +43,10 @@ using CLROIPoolingLayerFixture = ROIPoolingLayerFixture<CLTensor, CLROIPoolingLa TEST_SUITE(CL) -//FIXME: COMPMID-528 -DISABLED_REGISTER_FIXTURE_DATA_TEST_CASE(SmallROIPoolingLayer, CLROIPoolingLayerFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::SmallROIPoolingLayerDataset(), - framework::dataset::make("DataType", { DataType::F16, DataType::F32 })), - framework::dataset::make("Batches", { 1, 4, 8 }))); +REGISTER_FIXTURE_DATA_TEST_CASE(SmallROIPoolingLayer, CLROIPoolingLayerFixture, framework::DatasetMode::ALL, + framework::dataset::combine(framework::dataset::combine(datasets::SmallROIPoolingLayerDataset(), + framework::dataset::make("DataType", { DataType::F16, DataType::F32 })), + framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() } // namespace test diff --git a/tests/validation_old/CL/ROIPoolingLayer.cpp b/tests/validation_old/CL/ROIPoolingLayer.cpp index 2b2b039903..edd1cccf2a 100644 --- a/tests/validation_old/CL/ROIPoolingLayer.cpp +++ b/tests/validation_old/CL/ROIPoolingLayer.cpp @@ -85,8 +85,7 @@ BOOST_AUTO_TEST_SUITE(CL) BOOST_AUTO_TEST_SUITE(ROIPoolingLayer) BOOST_AUTO_TEST_SUITE(Float) -//FIXME: COMPMID-528 -BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::disabled()) +BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit")) BOOST_DATA_TEST_CASE(RunSmall, boost::unit_test::data::make({ DataType::F16, DataType::F32 }) * boost::unit_test::data::make({ 10, 20, 40 }) * boost::unit_test::data::make({ 7, 9 }) * boost::unit_test::data::make({ 1.f / 8.f, 1.f / 16.f }), dt, num_rois, roi_pool_size, roi_scale) diff --git a/tests/validation_old/TensorOperations.h b/tests/validation_old/TensorOperations.h index 79d3720b84..dd53c046df 100644 --- a/tests/validation_old/TensorOperations.h +++ b/tests/validation_old/TensorOperations.h @@ -1037,10 +1037,6 @@ void roi_pooling_layer(const Tensor<T> &in, Tensor<T> &out, const std::vector<RO int roi_width = std::max(support::cpp11::round(roi.rect.width * roi_scale), 1.f); int roi_height = std::max(support::cpp11::round(roi.rect.height * roi_scale), 1.f); - // Determine pooling regions - float pool_region_size_x = static_cast<float>(roi_width) / pool_w; - float pool_region_size_y = static_cast<float>(roi_height) / pool_h; - // Iterate through all channel for(int fm = 0; fm < fms; ++fm) { @@ -1049,10 +1045,10 @@ void roi_pooling_layer(const Tensor<T> &in, Tensor<T> &out, const std::vector<RO { for(int px = 0; px < pool_w; ++px) { - int region_start_x = static_cast<int>(std::floor(px * pool_region_size_x)); - int region_end_x = static_cast<int>(std::ceil((px + 1) * pool_region_size_x)); - int region_start_y = static_cast<int>(std::floor(py * pool_region_size_y)); - int region_end_y = static_cast<int>(std::ceil((py + 1) * pool_region_size_y)); + int region_start_x = static_cast<int>(std::floor((static_cast<float>(px) / pool_w) * roi_width)); + int region_end_x = static_cast<int>(std::floor((static_cast<float>(px + 1) / pool_w) * roi_width)); + int region_start_y = static_cast<int>(std::floor((static_cast<float>(py) / pool_h) * roi_height)); + int region_end_y = static_cast<int>(std::floor((static_cast<float>(py + 1) / pool_h) * roi_height)); region_start_x = std::min(std::max(region_start_x + roi_start_x, 0), width_in); region_end_x = std::min(std::max(region_end_x + roi_start_x, 0), width_in); |