diff options
| author | Matthew Bentham <Matthew.Bentham@arm.com> | 2018-10-03 17:18:04 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-10 16:16:58 +0100 |
| commit | d806792f7fbdae2cfa8dcb1eb59b9400b84741da (patch) | |
| tree | 7756e4ed88921e7d812e6619911e7fec664906ef /src/backends/test | |
| parent | 661dfa73bd5da4816a42acbb0768d0766d985e1c (diff) | |
| download | armnn-d806792f7fbdae2cfa8dcb1eb59b9400b84741da.tar.gz | |
IVGCVSW-1951 Remove type templating from ClConvolution2dWorkload
Change-Id: Iaa99500bfa8cea846f57636590698f9c8a8c2de0
Diffstat (limited to 'src/backends/test')
| -rw-r--r-- | src/backends/test/CreateWorkloadCl.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/backends/test/CreateWorkloadCl.cpp b/src/backends/test/CreateWorkloadCl.cpp index fb28ce1647..e81f844614 100644 --- a/src/backends/test/CreateWorkloadCl.cpp +++ b/src/backends/test/CreateWorkloadCl.cpp @@ -199,13 +199,12 @@ BOOST_AUTO_TEST_CASE(CreateConvertFp32ToFp16Workload) BOOST_TEST((outputHandle->GetTensor().info()->data_type() == arm_compute::DataType::F16)); } -template <typename Convolution2dWorkloadType, typename armnn::DataType DataType> +template <typename armnn::DataType DataType> static void ClConvolution2dWorkloadTest() { Graph graph; ClWorkloadFactory factory; - auto workload = CreateConvolution2dWorkloadTest<Convolution2dWorkloadType, DataType> - (factory, graph); + auto workload = CreateConvolution2dWorkloadTest<ClConvolution2dWorkload, DataType>(factory, graph); // Checks that outputs and inputs are as we expect them (see definition of CreateConvolution2dWorkloadTest). Convolution2dQueueDescriptor queueDescriptor = workload->GetData(); @@ -217,22 +216,20 @@ static void ClConvolution2dWorkloadTest() BOOST_AUTO_TEST_CASE(CreateConvolution2dFloatWorkload) { - ClConvolution2dWorkloadTest<ClConvolution2dFloatWorkload, armnn::DataType::Float32>(); + ClConvolution2dWorkloadTest<armnn::DataType::Float32>(); } BOOST_AUTO_TEST_CASE(CreateConvolution2dFloat16Workload) { - ClConvolution2dWorkloadTest<ClConvolution2dFloatWorkload, armnn::DataType::Float16>(); + ClConvolution2dWorkloadTest<armnn::DataType::Float16>(); } - -template <typename Convolution2dWorkloadType, typename armnn::DataType DataType> +template <typename armnn::DataType DataType> static void ClDirectConvolution2dWorkloadTest() { Graph graph; ClWorkloadFactory factory; - auto workload = CreateDirectConvolution2dWorkloadTest<Convolution2dWorkloadType, DataType>( - factory, graph); + auto workload = CreateDirectConvolution2dWorkloadTest<ClConvolution2dWorkload, DataType>(factory, graph); // Checks that outputs and inputs are as we expect them (see definition of CreateDirectConvolution2dWorkloadTest). Convolution2dQueueDescriptor queueDescriptor = workload->GetData(); @@ -244,17 +241,17 @@ static void ClDirectConvolution2dWorkloadTest() BOOST_AUTO_TEST_CASE(CreateDirectConvolution2dFloatWorkload) { - ClDirectConvolution2dWorkloadTest<ClConvolution2dFloatWorkload, armnn::DataType::Float32>(); + ClDirectConvolution2dWorkloadTest<armnn::DataType::Float32>(); } BOOST_AUTO_TEST_CASE(CreateDirectConvolution2dFloat16Workload) { - ClDirectConvolution2dWorkloadTest<ClConvolution2dFloatWorkload, armnn::DataType::Float16>(); + ClDirectConvolution2dWorkloadTest<armnn::DataType::Float16>(); } BOOST_AUTO_TEST_CASE(CreateDirectConvolution2dUint8Workload) { - ClDirectConvolution2dWorkloadTest<ClConvolution2dUint8Workload, armnn::DataType::QuantisedAsymm8>(); + ClDirectConvolution2dWorkloadTest<armnn::DataType::QuantisedAsymm8>(); } template <typename FullyConnectedWorkloadType, typename armnn::DataType DataType> |