From eff204aa3ae75277b0cf689eed0e2073ff644ef8 Mon Sep 17 00:00:00 2001 From: Colm Donelan Date: Tue, 28 Nov 2023 15:46:09 +0000 Subject: IVGCVSW-7675 Rework 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: Ia377c7a7399d0e30dc287d7217b3e3b52e1ea074 --- delegate/test/TransposeConvolution2dTest.cpp | 58 +++++----------------------- 1 file changed, 10 insertions(+), 48 deletions(-) (limited to 'delegate/test/TransposeConvolution2dTest.cpp') diff --git a/delegate/test/TransposeConvolution2dTest.cpp b/delegate/test/TransposeConvolution2dTest.cpp index b5261921f9..7c3728cedf 100644 --- a/delegate/test/TransposeConvolution2dTest.cpp +++ b/delegate/test/TransposeConvolution2dTest.cpp @@ -18,7 +18,7 @@ namespace armnnDelegate { -void TransposeConvInt8Test(std::vector& backends) +void TransposeConvInt8Test() { // Set input data std::vector transposeTensorShape { 4 }; @@ -37,8 +37,7 @@ void TransposeConvInt8Test(std::vector& backends) }; tflite::Padding padding = tflite::Padding_VALID; - TransposeConvTest(backends, - ::tflite::TensorType_INT8, + TransposeConvTest(::tflite::TensorType_INT8, 1, // strideX 1, // strideY padding, @@ -52,7 +51,7 @@ void TransposeConvInt8Test(std::vector& backends) expectedOutputValues); } -void TransposeConvFp32Test(std::vector& backends) +void TransposeConvFp32Test() { std::vector transposeTensorShape { 4 }; std::vector filterShape { 1, 2, 2, 1 }; @@ -70,8 +69,7 @@ void TransposeConvFp32Test(std::vector& backends) }; tflite::Padding padding = tflite::Padding_VALID; - TransposeConvTest(backends, - ::tflite::TensorType_FLOAT32, + TransposeConvTest(::tflite::TensorType_FLOAT32, 1, // strideX 1, // strideY padding, @@ -85,55 +83,19 @@ void TransposeConvFp32Test(std::vector& backends) expectedOutputValues); } -TEST_SUITE("TransposeConv_CpuRef_Test") +TEST_SUITE("TransposeConv_Test") { -TEST_CASE ("TransposeConv_CpuRef_Fp32_Test") +TEST_CASE ("TransposeConv_Fp32_Test") { - std::vector backends = {armnn::Compute::CpuRef}; - TransposeConvFp32Test(backends); + TransposeConvFp32Test(); } -TEST_CASE ("TransposeConv_CpuRef_Int8_Test") +TEST_CASE ("TransposeConv_Int8_Test") { - std::vector backends = {armnn::Compute::CpuRef}; - TransposeConvInt8Test(backends); + TransposeConvInt8Test(); } -} // End of TEST_SUITE(TransposeConv_CpuRef_Test) - -TEST_SUITE("TransposeConv_CpuAcc_Test") -{ - -TEST_CASE ("TransposeConv_CpuAcc_Fp32_Test") -{ - std::vector backends = {armnn::Compute::CpuAcc}; - TransposeConvFp32Test(backends); -} - -TEST_CASE ("TransposeConv_CpuAcc_Int8_Test") -{ - std::vector backends = {armnn::Compute::CpuAcc}; - TransposeConvInt8Test(backends); -} - -} // End of TEST_SUITE(TransposeConv_CpuAcc_Test) - -TEST_SUITE("TransposeConv_GpuAcc_Test") -{ - -TEST_CASE ("TransposeConv_GpuAcc_Fp32_Test") -{ - std::vector backends = {armnn::Compute::GpuAcc}; - TransposeConvFp32Test(backends); -} - -TEST_CASE ("TransposeConv_GpuAcc_Int8_Test") -{ - std::vector backends = {armnn::Compute::GpuAcc}; - TransposeConvInt8Test(backends); -} - -} // End of TEST_SUITE(TransposeConv_GpuAcc_Test) +} // End of TEST_SUITE(TransposeConv_Test) } // namespace armnnDelegate \ No newline at end of file -- cgit v1.2.1