diff options
| author | Nattapat Chaimanowong <nattapat.chaimanowong@arm.com> | 2018-10-15 15:07:34 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:54 +0100 |
| commit | 974b65fea888cc000a5164d5b56d9ed016391151 (patch) | |
| tree | 406f1793d434e1b3ecdae997916361b18c6c6c69 /src/backends/neon/test/NeonCreateWorkloadTests.cpp | |
| parent | 39fedf04d226360a8c77ca1ca3e2528a709101b5 (diff) | |
| download | armnn-974b65fea888cc000a5164d5b56d9ed016391151.tar.gz | |
IVGCVSW-1951 Remove type templating from NeonConvolution2dWorkload
Change-Id: Id3d8137d60b14e93863ad5b6db752a7f6ef9b7fb
Diffstat (limited to 'src/backends/neon/test/NeonCreateWorkloadTests.cpp')
| -rw-r--r-- | src/backends/neon/test/NeonCreateWorkloadTests.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backends/neon/test/NeonCreateWorkloadTests.cpp b/src/backends/neon/test/NeonCreateWorkloadTests.cpp index ec8fe803a1..63b3d41500 100644 --- a/src/backends/neon/test/NeonCreateWorkloadTests.cpp +++ b/src/backends/neon/test/NeonCreateWorkloadTests.cpp @@ -179,12 +179,12 @@ BOOST_AUTO_TEST_CASE(CreateBatchNormalizationFloatWorkload) NeonCreateBatchNormalizationWorkloadTest<NeonBatchNormalizationFloatWorkload, DataType::Float32>(); } -template <typename Convolution2dWorkloadType, typename armnn::DataType DataType> +template <typename armnn::DataType DataType> static void NeonCreateConvolution2dWorkloadTest(DataLayout dataLayout = DataLayout::NCHW) { Graph graph; NeonWorkloadFactory factory; - auto workload = CreateConvolution2dWorkloadTest<Convolution2dWorkloadType, + auto workload = CreateConvolution2dWorkloadTest<NeonConvolution2dWorkload, DataType>(factory, graph, dataLayout); TensorShape inputShape = (dataLayout == DataLayout::NCHW) ? TensorShape{2, 3, 8, 16} : TensorShape{2, 8, 16, 3}; @@ -201,23 +201,23 @@ static void NeonCreateConvolution2dWorkloadTest(DataLayout dataLayout = DataLayo #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC BOOST_AUTO_TEST_CASE(CreateConvolution2dFloat16NchwWorkload) { - NeonCreateConvolution2dWorkloadTest<NeonConvolution2dFloatWorkload, DataType::Float16>(); + NeonCreateConvolution2dWorkloadTest<DataType::Float16>(); } BOOST_AUTO_TEST_CASE(CreateConvolution2dFloat16NhwcWorkload) { - NeonCreateConvolution2dWorkloadTest<NeonConvolution2dFloatWorkload, DataType::Float16>(DataLayout::NHWC); + NeonCreateConvolution2dWorkloadTest<DataType::Float16>(DataLayout::NHWC); } #endif BOOST_AUTO_TEST_CASE(CreateConvolution2dFloatNchwWorkload) { - NeonCreateConvolution2dWorkloadTest<NeonConvolution2dFloatWorkload, DataType::Float32>(); + NeonCreateConvolution2dWorkloadTest<DataType::Float32>(); } BOOST_AUTO_TEST_CASE(CreateConvolution2dFloatNhwcWorkload) { - NeonCreateConvolution2dWorkloadTest<NeonConvolution2dFloatWorkload, DataType::Float32>(DataLayout::NHWC); + NeonCreateConvolution2dWorkloadTest<DataType::Float32>(DataLayout::NHWC); } template <typename DepthwiseConvolution2dFloat32WorkloadType, typename armnn::DataType DataType> |