diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-10-18 10:33:23 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:54 +0100 |
| commit | a160b245a5c876d3630651e938a7c45ee30645be (patch) | |
| tree | 0210f6e033a8c1043a0beffe12bf438a0d721302 /src/backends/cl/test/ClCreateWorkloadTests.cpp | |
| parent | e4dfd6ead59e17828f8814f0ecc5fa67f0c72868 (diff) | |
| download | armnn-a160b245a5c876d3630651e938a7c45ee30645be.tar.gz | |
IVGCVSW-2033 Add unit tests for the newly implemented NHWC support in
ref Normalization
* Added create workload unit tests for the NHWC data layout
Change-Id: Id4813105c027a26e277de64fecea1845fea39fd9
Diffstat (limited to 'src/backends/cl/test/ClCreateWorkloadTests.cpp')
| -rw-r--r-- | src/backends/cl/test/ClCreateWorkloadTests.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/backends/cl/test/ClCreateWorkloadTests.cpp b/src/backends/cl/test/ClCreateWorkloadTests.cpp index 526dc68fc5..756b4a603b 100644 --- a/src/backends/cl/test/ClCreateWorkloadTests.cpp +++ b/src/backends/cl/test/ClCreateWorkloadTests.cpp @@ -337,17 +337,20 @@ static void ClNormalizationWorkloadTest(DataLayout dataLayout) { Graph graph; ClWorkloadFactory factory; - - auto workload = CreateNormalizationWorkloadTest<NormalizationWorkloadType, DataType> - (factory, graph, dataLayout); + auto workload = CreateNormalizationWorkloadTest<NormalizationWorkloadType, DataType>(factory, graph, dataLayout); // Checks that inputs/outputs are as we expect them (see definition of CreateNormalizationWorkloadTest). NormalizationQueueDescriptor queueDescriptor = workload->GetData(); auto inputHandle = boost::polymorphic_downcast<IClTensorHandle*>(queueDescriptor.m_Inputs[0]); auto outputHandle = boost::polymorphic_downcast<IClTensorHandle*>(queueDescriptor.m_Outputs[0]); - BOOST_TEST(CompareIClTensorHandleShape(inputHandle, {3, 5, 5, 1})); - BOOST_TEST(CompareIClTensorHandleShape(outputHandle, {3, 5, 5, 1})); + std::initializer_list<unsigned int> inputShape = (dataLayout == DataLayout::NCHW) ? + std::initializer_list<unsigned int>({3, 5, 5, 1}) : std::initializer_list<unsigned int>({3, 1, 5, 5}); + std::initializer_list<unsigned int> outputShape = (dataLayout == DataLayout::NCHW) ? + std::initializer_list<unsigned int>({3, 5, 5, 1}) : std::initializer_list<unsigned int>({3, 1, 5, 5}); + + BOOST_TEST(CompareIClTensorHandleShape(inputHandle, inputShape)); + BOOST_TEST(CompareIClTensorHandleShape(outputHandle, outputShape)); } BOOST_AUTO_TEST_CASE(CreateNormalizationFloat32NchwWorkload) |