diff options
Diffstat (limited to 'tests/validation/fixtures/NonMaxSuppressionFixture.h')
-rw-r--r-- | tests/validation/fixtures/NonMaxSuppressionFixture.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/tests/validation/fixtures/NonMaxSuppressionFixture.h b/tests/validation/fixtures/NonMaxSuppressionFixture.h index 9299ed62a4..043b4731aa 100644 --- a/tests/validation/fixtures/NonMaxSuppressionFixture.h +++ b/tests/validation/fixtures/NonMaxSuppressionFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -46,7 +46,6 @@ template <typename TensorType, typename AccessorType, typename FunctionType> class NMSValidationFixture : public framework::Fixture { public: - template <typename...> void setup(TensorShape input_shape, unsigned int max_output_size, float score_threshold, float nms_threshold) { ARM_COMPUTE_ERROR_ON(max_output_size == 0); @@ -59,9 +58,9 @@ public: protected: template <typename U> - void fill(U &&tensor, int i, int lo, int hi) + void fill(U &&tensor, int i, float lo, float hi) { - std::uniform_real_distribution<> distribution(lo, hi); + std::uniform_real_distribution<float> distribution(lo, hi); library->fill_boxes(tensor, distribution, i); } @@ -77,18 +76,18 @@ protected: FunctionType nms_func; nms_func.configure(&bboxes, &scores, &indices, max_output_size, score_threshold, nms_threshold); - ARM_COMPUTE_EXPECT(bboxes.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(indices.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(scores.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_ASSERT(bboxes.info()->is_resizable()); + ARM_COMPUTE_ASSERT(indices.info()->is_resizable()); + ARM_COMPUTE_ASSERT(scores.info()->is_resizable()); // Allocate tensors bboxes.allocator()->allocate(); indices.allocator()->allocate(); scores.allocator()->allocate(); - ARM_COMPUTE_EXPECT(!bboxes.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!indices.info()->is_resizable(), framework::LogLevel::ERRORS); - ARM_COMPUTE_EXPECT(!scores.info()->is_resizable(), framework::LogLevel::ERRORS); + ARM_COMPUTE_ASSERT(!bboxes.info()->is_resizable()); + ARM_COMPUTE_ASSERT(!indices.info()->is_resizable()); + ARM_COMPUTE_ASSERT(!scores.info()->is_resizable()); // Fill tensors fill(AccessorType(bboxes), 0, 0.f, 1.f); |