diff options
author | Sadik Armagan <sadik.armagan@arm.com> | 2021-06-01 09:24:52 +0100 |
---|---|---|
committer | Sadik Armagan <sadik.armagan@arm.com> | 2021-06-02 13:00:56 +0000 |
commit | 483c811ea6fd0e7801aac1afd979ed02a649064b (patch) | |
tree | a0969c8786528334b62043b40983fa21d54d524e /src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp | |
parent | 31f86bfeb311ccc0c6ed94c35a78a51551148ea4 (diff) | |
download | armnn-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/ResizeTestImpl.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp index a2a804d54e..7706bde60d 100644 --- a/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ResizeTestImpl.cpp @@ -95,10 +95,10 @@ LayerTestResult<T, NumDims> ResizeTestImpl( std::vector<T> inputData = armnnUtils::QuantizedVector<T>(params.m_InputData, params.m_InQuantScale, params.m_InQuantOffset); - std::vector<T> expectedOutputData = - armnnUtils::QuantizedVector<T>(params.m_ExpectedOutputData, - params.m_OutQuantScale, - params.m_OutQuantOffset); + std::vector<T> actualOutput(outputInfo.GetNumElements()); + std::vector<T> expectedOutputData = armnnUtils::QuantizedVector<T>(params.m_ExpectedOutputData, + params.m_OutQuantScale, + params.m_OutQuantOffset); if (params.m_DataLayout == armnn::DataLayout::NHWC) { @@ -106,11 +106,6 @@ LayerTestResult<T, NumDims> ResizeTestImpl( PermuteTensorNchwToNhwc(outputInfo, expectedOutputData); } - auto input = MakeTensor<T, NumDims>(inputInfo, inputData); - - LayerTestResult<T, NumDims> result(outputInfo); - result.outputExpected = MakeTensor<T, NumDims>(outputInfo, expectedOutputData); - std::unique_ptr<armnn::ITensorHandle> inputHandle = tensorHandleFactory.CreateTensorHandle(inputInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = tensorHandleFactory.CreateTensorHandle(outputInfo); @@ -132,13 +127,17 @@ LayerTestResult<T, NumDims> ResizeTestImpl( inputHandle->Allocate(); outputHandle->Allocate(); - CopyDataToITensorHandle(inputHandle.get(), input.origin()); + CopyDataToITensorHandle(inputHandle.get(), inputData.data()); workload->PostAllocationConfigure(); workload->Execute(); - CopyDataFromITensorHandle(result.output.origin(), outputHandle.get()); - return result; + CopyDataFromITensorHandle(actualOutput.data(), outputHandle.get()); + + return LayerTestResult<T, NumDims>(actualOutput, + expectedOutputData, + outputHandle->GetShape(), + outputInfo.GetShape()); } } // anonymous namespace |