From 483c811ea6fd0e7801aac1afd979ed02a649064b Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Tue, 1 Jun 2021 09:24:52 +0100
Subject: IVGCVSW-5962 Remove boost::multi_array

 * Replaced all instances of boost::multi_array with flat vectors.
 * Updated LayerTestResult struct with new member variables.
 * Updated CompareTensor function to compare flat vectors and the shape.
 * Removed MakeTensor function from TensorHelpers.hpp.
 * Removed GetTensorShapeAsArray function from LayerTestResult.hpp.
 * Removed boost::array usage.
 * Removed boost::extents usages.
 * Removed boost::random usages.

Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Change-Id: Iccde9d6640b534940292ff048fb80c00b38c4743
---
 src/backends/neon/test/NeonLayerTests.cpp   |  1 +
 src/backends/neon/test/NeonMemCopyTests.cpp | 12 ++++++++----
 src/backends/neon/test/NeonTimerTest.cpp    |  6 +-----
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/backends/neon')

diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp
index 6cd26dfdd2..d12817e159 100644
--- a/src/backends/neon/test/NeonLayerTests.cpp
+++ b/src/backends/neon/test/NeonLayerTests.cpp
@@ -874,6 +874,7 @@ ARMNN_AUTO_TEST_CASE_WITH_THF(Minimum1DVectorUint8, MinimumBroadcast1DVectorUint
 ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleNormalizationAcross, SimpleNormalizationAcrossTest)
 ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleNormalizationWithin, SimpleNormalizationWithinTest)
 ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleNormalizationAcrossNhwc, SimpleNormalizationAcrossNhwcTest)
+ARMNN_AUTO_TEST_CASE_WITH_THF(AcrossChannelNormalization, AcrossChannelNormalizationTest)
 
 // Resize Bilinear - NCHW data layout
 ARMNN_AUTO_TEST_CASE_WITH_THF(SimpleResizeBilinear, SimpleResizeBilinearTest<DataType::Float32>, DataLayout::NCHW)
diff --git a/src/backends/neon/test/NeonMemCopyTests.cpp b/src/backends/neon/test/NeonMemCopyTests.cpp
index 6a3d05d000..2bb9e3d431 100644
--- a/src/backends/neon/test/NeonMemCopyTests.cpp
+++ b/src/backends/neon/test/NeonMemCopyTests.cpp
@@ -20,7 +20,8 @@ BOOST_AUTO_TEST_CASE(CopyBetweenCpuAndNeon)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::RefWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(false);
-    auto predResult = CompareTensors(result.output, result.outputExpected);
+    auto predResult = CompareTensors(result.m_ActualData,  result.m_ExpectedData,
+                                     result.m_ActualShape, result.m_ExpectedShape);
     BOOST_TEST(predResult.m_Result, predResult.m_Message.str());
 }
 
@@ -28,7 +29,8 @@ BOOST_AUTO_TEST_CASE(CopyBetweenNeonAndCpu)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::NeonWorkloadFactory, armnn::RefWorkloadFactory, armnn::DataType::Float32>(false);
-    auto predResult = CompareTensors(result.output, result.outputExpected);
+    auto predResult = CompareTensors(result.m_ActualData,  result.m_ExpectedData,
+                                     result.m_ActualShape, result.m_ExpectedShape);
     BOOST_TEST(predResult.m_Result, predResult.m_Message.str());
 }
 
@@ -36,7 +38,8 @@ BOOST_AUTO_TEST_CASE(CopyBetweenCpuAndNeonWithSubtensors)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::RefWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(true);
-    auto predResult = CompareTensors(result.output, result.outputExpected);
+    auto predResult = CompareTensors(result.m_ActualData,  result.m_ExpectedData,
+                                     result.m_ActualShape, result.m_ExpectedShape);
     BOOST_TEST(predResult.m_Result, predResult.m_Message.str());
 }
 
@@ -44,7 +47,8 @@ BOOST_AUTO_TEST_CASE(CopyBetweenNeonAndCpuWithSubtensors)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::NeonWorkloadFactory, armnn::RefWorkloadFactory, armnn::DataType::Float32>(true);
-    auto predResult = CompareTensors(result.output, result.outputExpected);
+    auto predResult = CompareTensors(result.m_ActualData,  result.m_ExpectedData,
+                                     result.m_ActualShape, result.m_ExpectedShape);
     BOOST_TEST(predResult.m_Result, predResult.m_Message.str());
 }
 
diff --git a/src/backends/neon/test/NeonTimerTest.cpp b/src/backends/neon/test/NeonTimerTest.cpp
index 9acd0e41e2..df014d5a9b 100644
--- a/src/backends/neon/test/NeonTimerTest.cpp
+++ b/src/backends/neon/test/NeonTimerTest.cpp
@@ -63,10 +63,6 @@ BOOST_AUTO_TEST_CASE(NeonTimerMeasure)
     armnn::TensorInfo outputTensorInfo({ outputBatchSize, outputChannels, outputHeight, outputWidth },
         armnn::DataType::Float32);
 
-    LayerTestResult<float, 4> result(inputTensorInfo);
-
-    auto input = MakeTensor<float, 4>(inputTensorInfo, inputData);
-
     ARMNN_NO_DEPRECATE_WARN_BEGIN
     std::unique_ptr<armnn::ITensorHandle> inputHandle = workloadFactory.CreateTensorHandle(inputTensorInfo);
     std::unique_ptr<armnn::ITensorHandle> outputHandle = workloadFactory.CreateTensorHandle(outputTensorInfo);
@@ -87,7 +83,7 @@ BOOST_AUTO_TEST_CASE(NeonTimerMeasure)
     inputHandle->Allocate();
     outputHandle->Allocate();
 
-    CopyDataToITensorHandle(inputHandle.get(), &input[0][0][0][0]);
+    CopyDataToITensorHandle(inputHandle.get(), inputData.data());
 
     NeonTimer neonTimer;
     // Start the timer.
-- 
cgit v1.2.1