From e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Thu, 14 Oct 2021 12:35:58 +0100 Subject: IVGCVSW-6428 Remove asserts * Changed asserts to check for errors and return appropriate values or throw exceptions * Changed unit tests to use Doctest's long macro names as the short macro names clashed with Android's Logging macros * Removed unused #includes * Clarified ambiguous #includes Signed-off-by: Mike Kelly Change-Id: Ice92a37590df727fd581d3be5ff2716665f26a13 --- test/Convolution2D.hpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'test/Convolution2D.hpp') diff --git a/test/Convolution2D.hpp b/test/Convolution2D.hpp index 540cdd7b..cc26f68f 100644 --- a/test/Convolution2D.hpp +++ b/test/Convolution2D.hpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd. All rights reserved. +// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -7,7 +7,6 @@ #include "DriverTestHelpers.hpp" -#include #include #include @@ -23,11 +22,11 @@ namespace driverTestHelpers #define ARMNN_ANDROID_FP16_TEST(result, fp16Expectation, fp32Expectation, fp16Enabled) \ if (fp16Enabled) \ { \ - CHECK_MESSAGE((result == fp16Expectation || result == fp32Expectation), result << \ + DOCTEST_CHECK_MESSAGE((result == fp16Expectation || result == fp32Expectation), result << \ " does not match either " << fp16Expectation << "[fp16] or " << fp32Expectation << "[fp32]"); \ } else \ { \ - CHECK(result == fp32Expectation); \ + DOCTEST_CHECK(result == fp32Expectation); \ } void SetModelFp16Flag(V1_0::Model& model, bool fp16Enabled); @@ -117,10 +116,10 @@ void PaddingTestImpl(android::nn::PaddingScheme paddingScheme, bool fp16Enabled break; case android::nn::kPaddingSame: ARMNN_ANDROID_FP16_TEST(outdata[0], 1022.f, 1022.25f, fp16Enabled) - CHECK(outdata[1] == 0.f); + DOCTEST_CHECK(outdata[1] == 0.f); break; default: - CHECK(false); + DOCTEST_CHECK(false); break; } } -- cgit v1.2.1