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/ArgMinMaxTestImpl.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/ArgMinMaxTestImpl.cpp')
| -rw-r--r-- | src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp index d63cc04e99..34b2539c32 100644 --- a/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp +++ b/src/backends/backendsCommon/test/layerTests/ArgMinMaxTestImpl.cpp @@ -27,10 +27,8 @@ LayerTestResult<int32_t, 3> ArgMinMaxTestCommon( const std::vector<int32_t>& outputData, int axis = 3) { - auto inputTensor = MakeTensor<T, 4>(inputTensorInfo, ConvertToDataType<ArmnnType>(inputData, inputTensorInfo)); - - LayerTestResult<int32_t, 3> result(outputTensorInfo); - result.outputExpected = MakeTensor<int32_t, 3>(outputTensorInfo, outputData); + std::vector<T> inputTensor = ConvertToDataType<ArmnnType>(inputData, inputTensorInfo); + std::vector<int32_t> actualOutput(outputTensorInfo.GetNumElements()); std::unique_ptr<armnn::ITensorHandle> inputHandle = tensorHandleFactory.CreateTensorHandle(inputTensorInfo); std::unique_ptr<armnn::ITensorHandle> outputHandle = tensorHandleFactory.CreateTensorHandle(outputTensorInfo); @@ -48,14 +46,17 @@ LayerTestResult<int32_t, 3> ArgMinMaxTestCommon( inputHandle->Allocate(); outputHandle->Allocate(); - CopyDataToITensorHandle(inputHandle.get(), &inputTensor[0][0][0][0]); + CopyDataToITensorHandle(inputHandle.get(), inputTensor.data()); workload->PostAllocationConfigure(); workload->Execute(); - CopyDataFromITensorHandle(&result.output[0][0][0], outputHandle.get()); + CopyDataFromITensorHandle(actualOutput.data(), outputHandle.get()); - return result; + return LayerTestResult<int32_t, 3>(actualOutput, + outputData, + outputHandle->GetShape(), + outputTensorInfo.GetShape()); } } // namespace |