aboutsummaryrefslogtreecommitdiff
path: root/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp
diff options
context:
space:
mode:
authorSadik Armagan <sadik.armagan@arm.com>2021-06-01 09:24:52 +0100
committerSadik Armagan <sadik.armagan@arm.com>2021-06-02 13:00:56 +0000
commit483c811ea6fd0e7801aac1afd979ed02a649064b (patch)
treea0969c8786528334b62043b40983fa21d54d524e /src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp
parent31f86bfeb311ccc0c6ed94c35a78a51551148ea4 (diff)
downloadarmnn-483c811ea6fd0e7801aac1afd979ed02a649064b.tar.gz
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
Diffstat (limited to 'src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp')
-rw-r--r--src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp
index 16e709d528..25989f90ed 100644
--- a/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp
+++ b/src/backends/backendsCommon/test/layerTests/StackTestImpl.cpp
@@ -33,14 +33,13 @@ LayerTestResult<T, outputDimLength> StackTestHelper(
{
IgnoreUnused(memoryManager);
unsigned int numInputs = static_cast<unsigned int>(inputData.size());
- std::vector<boost::multi_array<T, outputDimLength-1>> inputs;
+ std::vector<std::vector<T>> inputs;
for (unsigned int i = 0; i < numInputs; ++i)
{
- inputs.push_back(MakeTensor<T, outputDimLength-1>(inputTensorInfo, inputData[i]));
+ inputs.emplace_back(inputData[i]);
}
- LayerTestResult<T, outputDimLength> result(outputTensorInfo);
- result.outputExpected = MakeTensor<T, outputDimLength>(outputTensorInfo, outputExpectedData);
+ std::vector<T> actualOutput(outputTensorInfo.GetNumElements());
std::vector<std::unique_ptr<armnn::ITensorHandle>> inputHandles;
for (unsigned int i = 0; i < numInputs; ++i)
@@ -60,7 +59,7 @@ LayerTestResult<T, outputDimLength> StackTestHelper(
std::unique_ptr<armnn::ITensorHandle>& inputHandle = inputHandles[i];
AddInputToWorkload(descriptor, info, inputTensorInfo, inputHandle.get());
inputHandle->Allocate();
- CopyDataToITensorHandle(inputHandle.get(), inputs[i].origin());
+ CopyDataToITensorHandle(inputHandle.get(), inputs[i].data());
}
AddOutputToWorkload(descriptor, info, outputTensorInfo, outputHandle.get());
@@ -70,9 +69,12 @@ LayerTestResult<T, outputDimLength> StackTestHelper(
workload->Execute();
- CopyDataFromITensorHandle(result.output.origin(), outputHandle.get());
+ CopyDataFromITensorHandle(actualOutput.data(), outputHandle.get());
- return result;
+ return LayerTestResult<T, outputDimLength>(actualOutput,
+ outputExpectedData,
+ outputHandle->GetShape(),
+ outputTensorInfo.GetShape());
}
} // anonymous namespace