diff options
Diffstat (limited to 'src/backends')
| -rwxr-xr-x | src/backends/backendsCommon/test/LayerTests.cpp | 10 | ||||
| -rw-r--r-- | src/backends/reference/workloads/BatchToSpaceNd.cpp | 24 | ||||
| -rw-r--r-- | src/backends/reference/workloads/BatchToSpaceNd.hpp | 2 |
3 files changed, 17 insertions, 19 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); diff --git a/src/backends/reference/workloads/BatchToSpaceNd.cpp b/src/backends/reference/workloads/BatchToSpaceNd.cpp index bedf8418ef..4313085ba5 100644 --- a/src/backends/reference/workloads/BatchToSpaceNd.cpp +++ b/src/backends/reference/workloads/BatchToSpaceNd.cpp @@ -34,23 +34,17 @@ void BatchToSpaceNd(const DataLayoutIndexed& dataLayout, const TensorInfo& inputTensorInfo, const TensorInfo& outputTensorInfo, const std::vector<unsigned int>& blockShape, - const std::vector<std::vector<unsigned int>>& cropsData, + const std::vector<std::pair<unsigned int, unsigned int>>& cropsData, const float* inputData, float* outputData) { TensorShape inputShape = inputTensorInfo.GetShape(); - unsigned int inputNumDims = inputShape.GetNumDimensions(); - if (inputNumDims != 4) - { - throw armnn::InvalidArgumentException("Expected Input with 4 Dimensions"); - } + + BOOST_ASSERT_MSG(inputShape.GetNumDimensions() == 4, "Expected Input with 4 Dimensions"); TensorShape outputShape = outputTensorInfo.GetShape(); - unsigned int outputNumDims = outputShape.GetNumDimensions(); - if (outputNumDims != 4) - { - throw armnn::InvalidArgumentException("Expected Output with 4 Dimensions"); - } + + BOOST_ASSERT_MSG(outputShape.GetNumDimensions() == 4, "Expected Output with 4 Dimensions"); const unsigned int inputBatchSize = inputShape[0]; const unsigned int channels = inputShape[dataLayout.GetChannelsIndex()]; @@ -59,11 +53,15 @@ void BatchToSpaceNd(const DataLayoutIndexed& dataLayout, const unsigned int outputHeight = outputShape[dataLayout.GetHeightIndex()]; const unsigned int outputWidth = outputShape[dataLayout.GetWidthIndex()]; + BOOST_ASSERT_MSG(blockShape.size() > 0, "BlockShape must contain 1 or more entries"); + const unsigned int blockShapeHeight = blockShape[0]; const unsigned int blockShapeWidth = blockShape[1]; - const unsigned int cropsTop = cropsData[0][0]; - const unsigned int cropsLeft = cropsData[1][0]; + BOOST_ASSERT_MSG(cropsData.size() > 0, "Crops must contain 1 or more entries"); + + const unsigned int cropsTop = cropsData[0].first; + const unsigned int cropsLeft = cropsData[1].first; for (unsigned int inBatch = 0; inBatch < inputBatchSize; ++inBatch) { diff --git a/src/backends/reference/workloads/BatchToSpaceNd.hpp b/src/backends/reference/workloads/BatchToSpaceNd.hpp index 7923ceadd0..091d092777 100644 --- a/src/backends/reference/workloads/BatchToSpaceNd.hpp +++ b/src/backends/reference/workloads/BatchToSpaceNd.hpp @@ -16,7 +16,7 @@ void BatchToSpaceNd(const DataLayoutIndexed& dataLayout, const TensorInfo& inputTensorInfo, const TensorInfo& outputTensorInfo, const std::vector<unsigned int>& blockShape, - const std::vector<std::vector<unsigned int>>& cropsData, + const std::vector<std::pair<unsigned int, unsigned int>>& cropsData, const float* inputData, float* outputData); } // namespace armnn
\ No newline at end of file |