commit 483c811ea6fd0e7801aac1afd979ed02a649064b
author Sadik Armagan <sadik.armagan@arm.com> Tue Jun 01 09:24:52 2021 +0100
committer Sadik Armagan <sadik.armagan@arm.com> Wed Jun 02 13:00:56 2021 +0000
tree a0969c8786528334b62043b40983fa21d54d524e
parent 31f86bfeb311ccc0c6ed94c35a78a51551148ea4

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/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp

diff --git a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp
index 5d37e93..20e341b 100644
--- a/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp
+++ b/src/backends/backendsCommon/test/layerTests/ElementwiseUnaryTestImpl.hpp
@@ -55,9 +55,9 @@
     outputTensorInfo.SetQuantizationScale(outQuantScale);
     outputTensorInfo.SetQuantizationOffset(outQuantOffset);
 
-    auto input = MakeTensor<T, NumDims>(inputTensorInfo, ConvertToDataType<ArmnnType>(values, inputTensorInfo));
-
-    LayerTestResult<T, NumDims> ret(outputTensorInfo);
+    std::vector<T> input = ConvertToDataType<ArmnnType>(values, inputTensorInfo);
+    std::vector<T> expectedOutput = ConvertToDataType<ArmnnType>(outValues, inputTensorInfo);
+    std::vector<T> actualOutput(outputTensorInfo.GetNumElements());
 
     std::unique_ptr<armnn::ITensorHandle> inputHandle = tensorHandleFactory.CreateTensorHandle(inputTensorInfo);
     std::unique_ptr<armnn::ITensorHandle> outputHandle = tensorHandleFactory.CreateTensorHandle(outputTensorInfo);
@@ -73,16 +73,18 @@
     inputHandle->Allocate();
     outputHandle->Allocate();
 
-    CopyDataToITensorHandle(inputHandle.get(), input.origin());
+    CopyDataToITensorHandle(inputHandle.get(), input.data());
 
     workload->PostAllocationConfigure();
     ExecuteWorkload(*workload, memoryManager);
 
-    CopyDataFromITensorHandle(ret.output.origin(), outputHandle.get());
+    CopyDataFromITensorHandle(actualOutput.data(), outputHandle.get());
 
-    ret.outputExpected = MakeTensor<T, NumDims>(outputTensorInfo, ConvertToDataType<ArmnnType>(outValues,
-        inputTensorInfo));
-    return ret;
+    return LayerTestResult<T, NumDims>(actualOutput,
+                                       expectedOutput,
+                                       outputHandle->GetShape(),
+                                       outputTensorInfo.GetShape());
+
 }
 
 template <std::size_t NumDims,