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/MultiplicationTestImpl.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/MultiplicationTestImpl.cpp')
-rw-r--r-- | src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp index b8dc5f5667..c7b082183c 100644 --- a/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/MultiplicationTestImpl.cpp @@ -545,10 +545,11 @@ LayerTestResult<float,4> CompareMultiplicationTest( inputTensorInfo1 = armnn::TensorInfo(4, shape, armnn::DataType::Float32); outputTensorInfo = armnn::TensorInfo(4, shape, armnn::DataType::Float32); - LayerTestResult<float,4> comparisonResult(outputTensorInfo); + auto input0 = MakeRandomTensor<float>(inputTensorInfo0, 803506992); + auto input1 = MakeRandomTensor<float>(inputTensorInfo1, 54902257); - auto input0 = MakeRandomTensor<float, 4>(inputTensorInfo0, 803506992); - auto input1 = MakeRandomTensor<float, 4>(inputTensorInfo1, 54902257); + std::vector<float> actualOutput(outputTensorInfo.GetNumElements()); + std::vector<float> expectedOutput(outputTensorInfo.GetNumElements()); std::unique_ptr<armnn::ITensorHandle> inputHandle0 = tensorHandleFactory.CreateTensorHandle(inputTensorInfo0); std::unique_ptr<armnn::ITensorHandle> inputHandle1 = tensorHandleFactory.CreateTensorHandle(inputTensorInfo1); @@ -580,17 +581,20 @@ LayerTestResult<float,4> CompareMultiplicationTest( inputHandle1Ref->Allocate(); outputHandleRef->Allocate(); - CopyDataToITensorHandle(inputHandle0.get(), input0.origin()); - CopyDataToITensorHandle(inputHandle1.get(), input1.origin()); - CopyDataToITensorHandle(inputHandle0Ref.get(), input0.origin()); - CopyDataToITensorHandle(inputHandle1Ref.get(), input1.origin()); + CopyDataToITensorHandle(inputHandle0.get(), input0.data()); + CopyDataToITensorHandle(inputHandle1.get(), input1.data()); + CopyDataToITensorHandle(inputHandle0Ref.get(), input0.data()); + CopyDataToITensorHandle(inputHandle1Ref.get(), input1.data()); workload->PostAllocationConfigure(); workload->Execute(); workloadRef->PostAllocationConfigure(); workloadRef->Execute(); - CopyDataFromITensorHandle(comparisonResult.output.origin(), outputHandle.get()); - CopyDataFromITensorHandle(comparisonResult.outputExpected.origin(), outputHandleRef.get()); + CopyDataFromITensorHandle(actualOutput.data(), outputHandle.get()); + CopyDataFromITensorHandle(expectedOutput.data(), outputHandleRef.get()); - return comparisonResult; + return LayerTestResult<float, 4>(actualOutput, + expectedOutput, + outputHandle->GetShape(), + outputTensorInfo.GetShape()); } |