diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2021-10-14 12:35:58 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2021-10-14 12:35:58 +0100 |
| commit | e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b (patch) | |
| tree | 79d9178420924d57ed0ab23db46ff57159279886 /test/Convolution2D.hpp | |
| parent | 4bd8f7c96e01e081276c376fe5c34018e7b70d17 (diff) | |
| download | android-nn-driver-e2d611e4502fb5dce8b8a398ccfc8d7ef29da96b.tar.gz | |
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 <mike.kelly@arm.com>
Change-Id: Ice92a37590df727fd581d3be5ff2716665f26a13
Diffstat (limited to 'test/Convolution2D.hpp')
| -rw-r--r-- | test/Convolution2D.hpp | 11 |
1 files changed, 5 insertions, 6 deletions
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 <doctest/doctest.h> #include <log/log.h> #include <OperationsUtils.h> @@ -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; } } |