diff options
| author | Éanna Ó Catháin <eanna.ocathain@arm.com> | 2018-11-12 17:14:43 +0000 |
|---|---|---|
| committer | Saoirse Stewart Arm <saoirse.stewart@arm.com> | 2018-11-12 21:59:48 +0000 |
| commit | 95807cef855738ca481ace30f32ed9f245a098dd (patch) | |
| tree | 7df7181d6dc19f3db3054614076478af4f417e8a /src/backends/backendsCommon/test/LayerTests.cpp | |
| parent | 111b5d94d7e854c21377f8d2c0b4234317a903f6 (diff) | |
| download | armnn-95807cef855738ca481ace30f32ed9f245a098dd.tar.gz | |
Tidying up multiple issues
* Fixed error in InferOutputShape implementation
* Added better error checking to the BatchToSpace implementation.
* Added defaults to the batchToSpace descriptors.
* Changed crops to be a vector of pairs to align with the SpaceToBatch implementation
Change-Id: Ib1c16d871f0898a1caeb6629c1fee6380a773e14
Diffstat (limited to 'src/backends/backendsCommon/test/LayerTests.cpp')
| -rwxr-xr-x | src/backends/backendsCommon/test/LayerTests.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index 4a003036ca..85b3e1b2b7 100755 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -6178,7 +6178,7 @@ LayerTestResult<T, OutputDim> BatchToSpaceNdHelper(armnn::IWorkloadFactory &work const unsigned int *inputShape, const std::vector<T> &inputData, const std::vector<unsigned int> &blockShape, - const std::vector<std::vector<unsigned int>> &crops, + const std::vector<std::pair<unsigned int, unsigned int>> &crops, const unsigned int *outputShape, const std::vector<T> &outputData, float scale = 1.0f, @@ -6266,7 +6266,7 @@ LayerTestResult<float, 4> BatchToSpaceNdNhwcFloat32Test1(armnn::IWorkloadFactory }); std::vector<unsigned int> blockShape {2, 2}; - std::vector<std::vector<unsigned int>> crops = {{0, 0}, {0, 0}}; + std::vector<std::pair<unsigned int, unsigned int>> crops = {{0, 0}, {0, 0}}; return BatchToSpaceNdHelper<float, 4, 4>(workloadFactory, armnn::DataLayout::NHWC, inputShape, input, blockShape, crops, outputShape, expectedOutput); @@ -6286,7 +6286,7 @@ LayerTestResult<float, 4> BatchToSpaceNdNhwcFloat32Test2(armnn::IWorkloadFactory std::vector<float> expectedOutput({1.0f, 2.0f, 3.0f, 4.0f}); std::vector<unsigned int> blockShape({2, 2}); - std::vector<std::vector<unsigned int>> crops = {{0, 0}, {0, 0}}; + std::vector<std::pair<unsigned int, unsigned int>> crops = {{0, 0}, {0, 0}}; return BatchToSpaceNdHelper<float, 4, 4>(workloadFactory, armnn::DataLayout::NHWC, inputShape, input, blockShape, crops, outputShape, expectedOutput); @@ -6302,7 +6302,7 @@ LayerTestResult<float, 4> BatchToSpaceNdNhwcFloat32Test3(armnn::IWorkloadFactory std::vector<float> expectedOutput({ 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f }); std::vector<unsigned int> blockShape({2, 2}); - std::vector<std::vector<unsigned int>> crops = {{0, 0}, {0, 0}}; + std::vector<std::pair<unsigned int, unsigned int>> crops = {{0, 0}, {0, 0}}; return BatchToSpaceNdHelper<float, 4, 4>(workloadFactory, armnn::DataLayout::NHWC, inputShape, input, blockShape, crops, outputShape, expectedOutput); @@ -6331,7 +6331,7 @@ LayerTestResult<float, 4> BatchToSpaceNdNchwFloat32Test1(armnn::IWorkloadFactory }); std::vector<unsigned int> blockShape({2, 2}); - std::vector<std::vector<unsigned int>> crops = {{0, 0}, {0, 0}}; + std::vector<std::pair<unsigned int, unsigned int>> crops = {{0, 0}, {0, 0}}; return BatchToSpaceNdHelper<float, 4, 4>(workloadFactory, armnn::DataLayout::NCHW, inputShape, input, blockShape, crops, outputShape, expectedOutput); |