diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2019-06-03 16:54:25 +0100 |
|---|---|---|
| committer | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-06-04 15:13:51 +0000 |
| commit | 3122bd574a3d29774c535ca2136de361da626e88 (patch) | |
| tree | c2fcc19be67f5a35c30d042b80ba3157ef87bd21 /src/armnn/test | |
| parent | 550fe36f687e73c78b57ebfeee9f98fd35f40f24 (diff) | |
| download | armnn-3122bd574a3d29774c535ca2136de361da626e88.tar.gz | |
IVGCVSW-3212 Refactor the Reference BatchNormalization workloads to
handle Float32 and QAsymm8 types
* Removed the type-specific workload implementations
* Added type-independent RefBatchNormalizationWorkload implementation
* Reworked BachNormImpl to use decoders/encoders
* Improved the validation of the BatchNorm queue descriptor
* Fixed unit tests where necessary
Change-Id: Icf3fa1332292d38ec2fa0b1cb984cab78426034b
Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Diffstat (limited to 'src/armnn/test')
| -rw-r--r-- | src/armnn/test/CreateWorkload.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/armnn/test/CreateWorkload.hpp b/src/armnn/test/CreateWorkload.hpp index 87df00af3c..c4b191a29f 100644 --- a/src/armnn/test/CreateWorkload.hpp +++ b/src/armnn/test/CreateWorkload.hpp @@ -134,11 +134,10 @@ std::unique_ptr<WorkloadType> CreateElementwiseWorkloadTest(armnn::IWorkloadFact return workload; } -template <typename BatchNormalizationFloat32Workload, armnn::DataType DataType> -std::unique_ptr<BatchNormalizationFloat32Workload> CreateBatchNormalizationWorkloadTest( +template <typename BatchNormalizationWorkloadType, armnn::DataType DataType> +std::unique_ptr<BatchNormalizationWorkloadType> CreateBatchNormalizationWorkloadTest( armnn::IWorkloadFactory& factory, armnn::Graph& graph, DataLayout dataLayout = DataLayout::NCHW) { - TensorShape tensorShape; switch (dataLayout) { @@ -171,14 +170,14 @@ std::unique_ptr<BatchNormalizationFloat32Workload> CreateBatchNormalizationWorkl Layer* const input = graph.AddLayer<InputLayer>(0, "input"); Layer* const output = graph.AddLayer<OutputLayer>(0, "output"); - //Connects up. + // Connects up. armnn::TensorInfo tensorInfo(tensorShape, DataType); Connect(input, layer, tensorInfo); Connect(layer, output, tensorInfo); CreateTensorHandles(graph, factory); // Makes the workload and checks it. - auto workload = MakeAndCheckWorkload<BatchNormalizationFloat32Workload>(*layer, graph, factory); + auto workload = MakeAndCheckWorkload<BatchNormalizationWorkloadType>(*layer, graph, factory); BatchNormalizationQueueDescriptor queueDescriptor = workload->GetData(); BOOST_TEST(queueDescriptor.m_Parameters.m_Eps == 0.05f); BOOST_TEST(queueDescriptor.m_Inputs.size() == 1); |