diff options
| author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2018-10-17 11:12:19 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:54 +0100 |
| commit | 7714088e14d1fcd63153a80e7439d59a1824a3dc (patch) | |
| tree | 10f2c7eb343bfd20d3c1cd4ecdd45fa740225c9d /src/backends/neon/test/NeonCreateWorkloadTests.cpp | |
| parent | 974b65fea888cc000a5164d5b56d9ed016391151 (diff) | |
| download | armnn-7714088e14d1fcd63153a80e7439d59a1824a3dc.tar.gz | |
IVGCVSW-1951 Remove type templating from NeonDepthwiseConvolutionWorkload
Change-Id: I411d02949524eb802672d83ee281300c34b007c8
Diffstat (limited to 'src/backends/neon/test/NeonCreateWorkloadTests.cpp')
| -rw-r--r-- | src/backends/neon/test/NeonCreateWorkloadTests.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index 63b3d41500..4b6ab51924 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -220,13 +220,13 @@ BOOST_AUTO_TEST_CASE(CreateConvolution2dFloatNhwcWorkload) NeonCreateConvolution2dWorkloadTest<DataType::Float32>(DataLayout::NHWC); } -template <typename DepthwiseConvolution2dFloat32WorkloadType, typename armnn::DataType DataType> +template <typename armnn::DataType DataType> static void NeonCreateDepthWiseConvolutionWorkloadTest(DataLayout dataLayout) { Graph graph; NeonWorkloadFactory factory; - auto workload = CreateDepthwiseConvolution2dWorkloadTest<DepthwiseConvolution2dFloat32WorkloadType, + auto workload = CreateDepthwiseConvolution2dWorkloadTest<NeonDepthwiseConvolutionWorkload, DataType>(factory, graph, dataLayout); // Checks that inputs/outputs are as we expect them (see definition of CreateNormalizationWorkloadTest). @@ -247,15 +247,13 @@ static void NeonCreateDepthWiseConvolutionWorkloadTest(DataLayout dataLayout) BOOST_AUTO_TEST_CASE(CreateDepthWiseConvolution2dFloat32NhwcWorkload) { - NeonCreateDepthWiseConvolutionWorkloadTest<NeonDepthwiseConvolutionFloatWorkload, - DataType::Float32>(DataLayout::NHWC); + NeonCreateDepthWiseConvolutionWorkloadTest<DataType::Float32>(DataLayout::NHWC); } #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC BOOST_AUTO_TEST_CASE(CreateDepthWiseConvolution2dFloat16NhwcWorkload) { - NeonCreateDepthWiseConvolutionWorkloadTest<NeonDepthwiseConvolutionFloatWorkload, - DataType::Float16>(DataLayout::NHWC); + NeonCreateDepthWiseConvolutionWorkloadTest<DataType::Float16>(DataLayout::NHWC); } #endif |