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 /tests | |
| 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>
Diffstat (limited to 'tests')
| -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 |
3 files changed, 9 insertions, 15 deletions
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); |