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/ActivationFixture.hpp | |
| 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/ActivationFixture.hpp')
| -rw-r--r-- | src/backends/backendsCommon/test/ActivationFixture.hpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/backends/backendsCommon/test/ActivationFixture.hpp b/src/backends/backendsCommon/test/ActivationFixture.hpp index d28174d6a6..c61f3f097e 100644 --- a/src/backends/backendsCommon/test/ActivationFixture.hpp +++ b/src/backends/backendsCommon/test/ActivationFixture.hpp @@ -11,20 +11,13 @@ #include <test/TensorHelpers.hpp> -#include <boost/multi_array.hpp> - struct ActivationFixture { ActivationFixture() { - auto boostArrayExtents = boost::extents - [armnn::numeric_cast<boost::multi_array_types::extent_gen::index>(batchSize)] - [armnn::numeric_cast<boost::multi_array_types::extent_gen::index>(channels)] - [armnn::numeric_cast<boost::multi_array_types::extent_gen::index>(height)] - [armnn::numeric_cast<boost::multi_array_types::extent_gen::index>(width)]; - output.resize(boostArrayExtents); - outputExpected.resize(boostArrayExtents); - input.resize(boostArrayExtents); + output.resize(batchSize * channels * height * width); + outputExpected.resize(batchSize * channels * height * width); + input.resize(batchSize * channels * height * width); unsigned int inputShape[] = { batchSize, channels, height, width }; unsigned int outputShape[] = { batchSize, channels, height, width }; @@ -32,7 +25,7 @@ struct ActivationFixture inputTensorInfo = armnn::TensorInfo(4, inputShape, armnn::DataType::Float32); outputTensorInfo = armnn::TensorInfo(4, outputShape, armnn::DataType::Float32); - input = MakeRandomTensor<float, 4>(inputTensorInfo, 21453); + input = MakeRandomTensor<float>(inputTensorInfo, 21453); } unsigned int width = 17; @@ -40,9 +33,9 @@ struct ActivationFixture unsigned int channels = 2; unsigned int batchSize = 5; - boost::multi_array<float, 4> output; - boost::multi_array<float, 4> outputExpected; - boost::multi_array<float, 4> input; + std::vector<float> output; + std::vector<float> outputExpected; + std::vector<float> input; armnn::TensorInfo inputTensorInfo; armnn::TensorInfo outputTensorInfo; @@ -57,6 +50,6 @@ struct PositiveActivationFixture : public ActivationFixture { PositiveActivationFixture() { - input = MakeRandomTensor<float, 4>(inputTensorInfo, 2342423, 0.0f, 1.0f); + input = MakeRandomTensor<float>(inputTensorInfo, 2342423, 0.0f, 1.0f); } };
\ No newline at end of file |