diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2020-09-22 14:35:19 +0100 |
|---|---|---|
| committer | Sadik Armagan <sadik.armagan@arm.com> | 2020-09-22 16:21:40 +0000 |
| commit | 283a8b4aeaebf27c7f14e0c9c4cbfaf06a577cf5 (patch) | |
| tree | 15867a066249115b309a0969ff73cf6de75957a4 /src/backends | |
| parent | a2364ed649290f74e0608d0208c4746664b0abbc (diff) | |
| download | armnn-283a8b4aeaebf27c7f14e0c9c4cbfaf06a577cf5.tar.gz | |
IVGCVSW-5318 'Create a Neon/CL Workload Unit Test fast_math option enabled'
* Unit test implemented to make sure it returns WINOGRAD
* Updated the enable-fast-math option in ExecuteNetwork to be consistent
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: Id64f114ae47966def69a9eef0770a4251ee56a41
Diffstat (limited to 'src/backends')
| -rw-r--r-- | src/backends/cl/test/ClCreateWorkloadTests.cpp | 5 | ||||
| -rw-r--r-- | src/backends/neon/test/NeonCreateWorkloadTests.cpp | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index fc5ccfe487..4bd3d3a33d 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -322,7 +322,7 @@ BOOST_AUTO_TEST_CASE(CreateConvolution2dFastMathEnabledWorkload) ClWorkloadFactoryHelper::GetFactory(ClWorkloadFactoryHelper::GetMemoryManager(), modelOptions); auto workload = - CreateConvolution2dWorkloadTest<ClConvolution2dWorkload, armnn::DataType::Float32>(factory, + CreateConvolution2dWorkloadFastMathTest<ClConvolution2dWorkload, armnn::DataType::Float32>(factory, graph, DataLayout::NCHW, modelOptions); @@ -331,8 +331,7 @@ BOOST_AUTO_TEST_CASE(CreateConvolution2dFastMathEnabledWorkload) auto conv2dWorkload = PolymorphicDowncast<ClConvolution2dWorkload*>(workload.get()); IgnoreUnused(conv2dWorkload); ARMNN_ASSERT(conv2dWorkload != nullptr); - // fast_math enabled but configuration does not match with WINOGRAD - ARMNN_ASSERT(conv2dWorkload->GetConvolutionMethod() == arm_compute::ConvolutionMethod::GEMM); + ARMNN_ASSERT(conv2dWorkload->GetConvolutionMethod() == arm_compute::ConvolutionMethod::WINOGRAD); } template <typename DepthwiseConvolutionWorkloadType, typename armnn::DataType DataType> diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index 99ff9ae8b8..c994bfe55a 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -292,7 +292,7 @@ BOOST_AUTO_TEST_CASE(CreateConvolution2dFastMathEnabledWorkload) NeonWorkloadFactoryHelper::GetFactory(NeonWorkloadFactoryHelper::GetMemoryManager(), modelOptions); auto workload = - CreateConvolution2dWorkloadTest<NeonConvolution2dWorkload, armnn::DataType::Float32>(factory, + CreateConvolution2dWorkloadFastMathTest<NeonConvolution2dWorkload, armnn::DataType::Float32>(factory, graph, DataLayout::NCHW, modelOptions); @@ -301,8 +301,7 @@ BOOST_AUTO_TEST_CASE(CreateConvolution2dFastMathEnabledWorkload) auto conv2dWorkload = PolymorphicDowncast<NeonConvolution2dWorkload*>(workload.get()); IgnoreUnused(conv2dWorkload); ARMNN_ASSERT(conv2dWorkload != nullptr); - // fast_math enabled but configuration does not match with WINOGRAD - ARMNN_ASSERT(conv2dWorkload->GetConvolutionMethod() == arm_compute::ConvolutionMethod::GEMM); + ARMNN_ASSERT(conv2dWorkload->GetConvolutionMethod() == arm_compute::ConvolutionMethod::WINOGRAD); } template <typename armnn::DataType DataType> |