From 7bcae3c835468d9b0770514dc7127f02d47cec5f Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Mon, 22 Jan 2024 10:07:14 +0000 Subject: IVGCVSW-7675 Rework more DelegateUnitTests so backends are subcases. The intent of this change is to remove the per backend test cases in the delegate unit tests. They will be replaced by using DocTest SUBCASES. The sub cases are paramaterized by the available backends. The list of available backends are determined by the compilation flags. Signed-off-by: Colm Donelan Change-Id: I6dd0369491c4582b8e2467b911dfd085dddcf576 --- delegate/test/PreluTest.cpp | 96 ++++++--------------------------------------- 1 file changed, 12 insertions(+), 84 deletions(-) (limited to 'delegate/test/PreluTest.cpp') diff --git a/delegate/test/PreluTest.cpp b/delegate/test/PreluTest.cpp index 3240eafe2b..990d91a33f 100644 --- a/delegate/test/PreluTest.cpp +++ b/delegate/test/PreluTest.cpp @@ -1,24 +1,15 @@ // -// Copyright © 2021, 2023 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2021, 2023-2024 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // #include "PreluTestHelper.hpp" -#include - -#include -#include -#include -#include - -#include - #include namespace armnnDelegate { -void PreluFloatSimpleTest(std::vector & backends, bool isAlphaConst, bool isDynamicOutput = false) +void PreluFloatSimpleTest(bool isAlphaConst, bool isDynamicOutput = false) { std::vector inputShape { 1, 2, 3 }; std::vector alphaShape { 1 }; @@ -35,7 +26,6 @@ void PreluFloatSimpleTest(std::vector & backends, bool isAlpha PreluTest(tflite::BuiltinOperator_PRELU, ::tflite::TensorType_FLOAT32, - backends, inputShape, alphaShape, outputShape, @@ -45,91 +35,29 @@ void PreluFloatSimpleTest(std::vector & backends, bool isAlpha isAlphaConst); } -TEST_SUITE("Prelu_CpuRefTests") -{ - -TEST_CASE ("PreluFp32SimpleConstTest_CpuRef_Test") -{ - std::vector backends = { armnn::Compute::CpuRef }; - PreluFloatSimpleTest(backends, true); -} - -TEST_CASE ("PreluFp32SimpleTest_CpuRef_Test") -{ - std::vector backends = { armnn::Compute::CpuRef }; - PreluFloatSimpleTest(backends, false); -} - -TEST_CASE ("PreluFp32SimpleConstDynamicTest_CpuRef_Test") -{ - std::vector backends = { armnn::Compute::CpuRef }; - PreluFloatSimpleTest(backends, true, true); -} - -TEST_CASE ("PreluFp32SimpleDynamicTest_CpuRef_Test") -{ - std::vector backends = { armnn::Compute::CpuRef }; - PreluFloatSimpleTest(backends, false, true); -} - -} // TEST_SUITE("Prelu_CpuRefTests") - -TEST_SUITE("Prelu_CpuAccTests") -{ - -TEST_CASE ("PreluFp32SimpleConstTest_CpuAcc_Test") -{ - std::vector backends = { armnn::Compute::CpuAcc }; - PreluFloatSimpleTest(backends, true); -} - -TEST_CASE ("PreluFp32SimpleTest_CpuAcc_Test") -{ - std::vector backends = { armnn::Compute::CpuAcc }; - PreluFloatSimpleTest(backends, false); -} - -TEST_CASE ("PreluFp32SimpleConstDynamicTest_CpuAcc_Test") -{ - std::vector backends = { armnn::Compute::CpuAcc }; - PreluFloatSimpleTest(backends, true, true); -} - -TEST_CASE ("PreluFp32SimpleDynamicTest_CpuAcc_Test") -{ - std::vector backends = { armnn::Compute::CpuAcc }; - PreluFloatSimpleTest(backends, false, true); -} - -} // TEST_SUITE("Prelu_CpuAccTests") - -TEST_SUITE("Prelu_GpuAccTests") +TEST_SUITE("PreluTests") { -TEST_CASE ("PreluFp32SimpleConstTest_GpuAcc_Test") +TEST_CASE ("PreluFp32SimpleConstTest_Test") { - std::vector backends = { armnn::Compute::GpuAcc }; - PreluFloatSimpleTest(backends, true); + PreluFloatSimpleTest(true); } -TEST_CASE ("PreluFp32SimpleTest_GpuAcc_Test") +TEST_CASE ("PreluFp32SimpleTest_Test") { - std::vector backends = { armnn::Compute::GpuAcc }; - PreluFloatSimpleTest(backends, false); + PreluFloatSimpleTest(false); } -TEST_CASE ("PreluFp32SimpleConstDynamicTest_GpuAcc_Test") +TEST_CASE ("PreluFp32SimpleConstDynamicTest_Test") { - std::vector backends = { armnn::Compute::GpuAcc }; - PreluFloatSimpleTest(backends, true, true); + PreluFloatSimpleTest(true, true); } -TEST_CASE ("PreluFp32SimpleDynamicTest_GpuAcc_Test") +TEST_CASE ("PreluFp32SimpleDynamicTest_Test") { - std::vector backends = { armnn::Compute::GpuAcc }; - PreluFloatSimpleTest(backends, false, true); + PreluFloatSimpleTest(false, true); } -} // TEST_SUITE("Prelu_GpuAccTests") +} // TEST_SUITE("PreluTests") } \ No newline at end of file -- cgit v1.2.1