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/TransposeConvolution2dTestImpl.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/TransposeConvolution2dTestImpl.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp index 85ce7e5e6f..cd775729cd 100644 --- a/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/TransposeConvolution2dTestImpl.cpp @@ -183,8 +183,8 @@ LayerTestResult<T, 4> TransposeConvolution2dTest( // execute test TransposeConvolution2dTestImpl(workloadFactory, - memoryManager, - tensorHandleFactory, + memoryManager, + tensorHandleFactory, descriptor, input, output, @@ -193,11 +193,10 @@ LayerTestResult<T, 4> TransposeConvolution2dTest( // construct result object LayerTestResult<T, 4> testResult(outputInfo); - testResult.output = MakeTensor<T, 4>(outputInfo, output.second); - testResult.outputExpected = MakeTensor<T, 4>(outputInfo, - armnnUtils::QuantizedVector<T>(expectedOutputData, - outputInfo.GetQuantizationScale(), - outputInfo.GetQuantizationOffset())); + testResult.m_ActualData = output.second; + testResult.m_ExpectedData = armnnUtils::QuantizedVector<T>(expectedOutputData, + outputInfo.GetQuantizationScale(), + outputInfo.GetQuantizationOffset()); return testResult; } @@ -611,6 +610,8 @@ LayerTestResult<uint8_t, 4> TransposeConvolution2dPerAxisQuantTest( std::vector<int32_t> biasData = { -12, -8 }; + std::vector<uint8_t> actualOutput(outputInfo.GetNumElements()); + std::vector<uint8_t> expectedOutputData = { 9, 13, 21, 19, 27, @@ -665,11 +666,12 @@ LayerTestResult<uint8_t, 4> TransposeConvolution2dPerAxisQuantTest( ExecuteWorkload(*workload, memoryManager); - LayerTestResult<uint8_t, 4> ret(outputInfo); - CopyDataFromITensorHandle(ret.output.origin(), outputHandle.get()); - ret.outputExpected = MakeTensor<uint8_t, 4>(outputInfo, expectedOutputData); + CopyDataFromITensorHandle(actualOutput.data(), outputHandle.get()); - return ret; + return LayerTestResult<uint8_t, 4>(actualOutput, + expectedOutputData, + outputHandle->GetShape(), + outputInfo.GetShape()); } // |