From 0637bf38b24bba3a3d88f34ed956111a3abddda2 Mon Sep 17 00:00:00 2001 From: Cathal Corbett Date: Tue, 20 Dec 2022 18:35:34 +0000 Subject: IVGCVSW-7211 Fix float16 operators being wrongly unsupported with android-nn-driver. !armnn:8862 * Added float16 mean test cases. * Float16 CTS/CTS pass on CpuAcc. Signed-off-by: Cathal Corbett Change-Id: Ibd9021d0ae4a205cc2c91555f3ae00c6dba84609 --- test/1.1/Mean.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/1.1/Mean.cpp') diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp index 34c29bad..70bdc3d3 100644 --- a/test/1.1/Mean.cpp +++ b/test/1.1/Mean.cpp @@ -1,5 +1,5 @@ // -// Copyright © 2017 Arm Ltd and Contributors. All rights reserved. +// Copyright © 2017, 2022 Arm Ltd and Contributors. All rights reserved. // SPDX-License-Identifier: MIT // @@ -124,7 +124,7 @@ DOCTEST_TEST_SUITE("MeanTests_CpuRef") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::CpuRef); } - DOCTEST_TEST_CASE("MeanFp16NoKeepDimsTest_CpuRef") + DOCTEST_TEST_CASE("MeanFp16EnabledNoKeepDimsTest_CpuRef") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -138,7 +138,7 @@ DOCTEST_TEST_SUITE("MeanTests_CpuRef") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, true, armnn::Compute::CpuRef); } - DOCTEST_TEST_CASE("MeanFp16KeepDimsTest_CpuRef") + DOCTEST_TEST_CASE("MeanFp16EnabledKeepDimsTest_CpuRef") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; @@ -179,7 +179,7 @@ DOCTEST_TEST_SUITE("MeanTests_CpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::CpuAcc); } - DOCTEST_TEST_CASE("MeanFp16NoKeepDimsTest_CpuAcc") + DOCTEST_TEST_CASE("MeanFp16EnabledNoKeepDimsTest_CpuAcc") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -193,7 +193,7 @@ DOCTEST_TEST_SUITE("MeanTests_CpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, true, armnn::Compute::CpuAcc); } - DOCTEST_TEST_CASE("MeanFp16KeepDimsTest_CpuAcc") + DOCTEST_TEST_CASE("MeanFp16EnabledKeepDimsTest_CpuAcc") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; @@ -232,7 +232,7 @@ DOCTEST_TEST_SUITE("MeanTests_GpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, false, armnn::Compute::GpuAcc); } - DOCTEST_TEST_CASE("MeanFp16NoKeepDimsTest_GpuAcc") + DOCTEST_TEST_CASE("MeanFp16EnabledNoKeepDimsTest_GpuAcc") { TestTensor input{ armnn::TensorShape{ 4, 3, 2 }, { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, @@ -246,7 +246,7 @@ DOCTEST_TEST_SUITE("MeanTests_GpuAcc") MeanTestImpl(input, axisDimensions, axisValues, keepDims, expectedOutput, true, armnn::Compute::GpuAcc); } - DOCTEST_TEST_CASE("MeanFp16KeepDimsTest_GpuAcc") + DOCTEST_TEST_CASE("MeanFp16EnabledKeepDimsTest_GpuAcc") { TestTensor input{ armnn::TensorShape{ 1, 1, 3, 2 }, { 1.0f, 1.0f, 2.0f, 2.0f, 3.0f, 3.0f } }; hidl_vec axisDimensions = { 1 }; -- cgit v1.2.1