diff options
| author | Isabella Gottardi <isabella.gottardi@arm.com> | 2019-07-15 17:33:07 +0100 |
|---|---|---|
| committer | Isabella Gottardi <isabella.gottardi@arm.com> | 2019-07-29 13:01:03 +0000 |
| commit | 883bad7ef34c3429b3338d5544a8cdf3b60cd1e8 (patch) | |
| tree | 8e8a485c2581137c643003466ea1c467a579ba99 /tests/validation/CPP | |
| parent | bd9097db81f229c2d7bbafc2bcf392b7c1c49b58 (diff) | |
| download | ComputeLibrary-883bad7ef34c3429b3338d5544a8cdf3b60cd1e8.tar.gz | |
COMPMID-1849: Add DetectorPostProcess operator
Part1 - Rework of CPPNonMaximumSuppression
Change-Id: I2b34fbd12188db49b0ac050a12312494eeefd819
Signed-off-by: Isabella Gottardi <isabella.gottardi@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1585
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Diffstat (limited to 'tests/validation/CPP')
| -rw-r--r-- | tests/validation/CPP/NonMaximumSuppression.cpp (renamed from tests/validation/CPP/NonMaximalSuppression.cpp) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/validation/CPP/NonMaximalSuppression.cpp b/tests/validation/CPP/NonMaximumSuppression.cpp index 6cd7b52066..bf24b2cf0c 100644 --- a/tests/validation/CPP/NonMaximalSuppression.cpp +++ b/tests/validation/CPP/NonMaximumSuppression.cpp @@ -22,7 +22,7 @@ * SOFTWARE. */ #include "arm_compute/core/Types.h" -#include "arm_compute/runtime/CPP/functions/CPPDetectionOutputLayer.h" +#include "arm_compute/runtime/CPP/functions/CPPNonMaximumSuppression.h" #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" @@ -42,11 +42,11 @@ namespace validation { namespace { -const auto max_output_boxes_dataset = framework::dataset::make("MaxOutputBoxes", 1, 10); -const auto score_threshold_dataset = framework::dataset::make("ScoreThreshold", { 0.1f, 0.5f, 0.f, 1.f }); -const auto nms_threshold_dataset = framework::dataset::make("NMSThreshold", { 0.1f, 0.5f, 0.f, 1.f }); -const auto NMSParametersSmall = datasets::Small2DNonMaxSuppressionShapes() * max_output_boxes_dataset * score_threshold_dataset * nms_threshold_dataset; -const auto NMSParametersBig = datasets::Large2DNonMaxSuppressionShapes() * max_output_boxes_dataset * score_threshold_dataset * nms_threshold_dataset; +const auto max_output_boxes_dataset = framework::dataset::make("MaxOutputBoxes", 1, 10); +const auto score_threshold_dataset = framework::dataset::make("ScoreThreshold", { 0.1f, 0.5f, 0.f, 1.f }); +const auto iou_nms_threshold_dataset = framework::dataset::make("NMSThreshold", { 0.1f, 0.5f, 0.f, 1.f }); +const auto NMSParametersSmall = datasets::Small2DNonMaxSuppressionShapes() * max_output_boxes_dataset * score_threshold_dataset * iou_nms_threshold_dataset; +const auto NMSParametersBig = datasets::Large2DNonMaxSuppressionShapes() * max_output_boxes_dataset * score_threshold_dataset * iou_nms_threshold_dataset; } // namespace @@ -137,8 +137,8 @@ FIXTURE_DATA_TEST_CASE(RunLarge, CPPNonMaxSuppressionFixture, framework::Dataset validate(Accessor(_target), _reference); } -TEST_SUITE_END() // CPP TEST_SUITE_END() // NMS +TEST_SUITE_END() // CPP } // namespace validation } // namespace test } // namespace arm_compute |