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/cl/test/ClMemCopyTests.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/backends/cl/test/ClMemCopyTests.cpp')

diff --git a/src/backends/cl/test/ClMemCopyTests.cpp b/src/backends/cl/test/ClMemCopyTests.cpp
index c26f7bdae8..1048e73c1b 100644
--- a/src/backends/cl/test/ClMemCopyTests.cpp
+++ b/src/backends/cl/test/ClMemCopyTests.cpp
@@ -19,7 +19,8 @@ BOOST_AUTO_TEST_CASE(CopyBetweenCpuAndGpu)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::RefWorkloadFactory, armnn::ClWorkloadFactory, 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());
 }
 
@@ -27,7 +28,8 @@ BOOST_AUTO_TEST_CASE(CopyBetweenGpuAndCpu)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::ClWorkloadFactory, 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());
 }
 
@@ -35,7 +37,8 @@ BOOST_AUTO_TEST_CASE(CopyBetweenCpuAndGpuWithSubtensors)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::RefWorkloadFactory, armnn::ClWorkloadFactory, 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());
 }
 
@@ -43,7 +46,8 @@ BOOST_AUTO_TEST_CASE(CopyBetweenGpuAndCpuWithSubtensors)
 {
     LayerTestResult<float, 4> result =
         MemCopyTest<armnn::ClWorkloadFactory, 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());
 }
 
-- 
cgit v1.2.1