diff options
author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-11-24 15:11:54 +0000 |
---|---|---|
committer | Teresa Charlin <teresa.charlinreyes@arm.com> | 2020-11-27 09:30:46 +0000 |
commit | f2ed1b84caccb05c9e00e18b2cb2d2a2875b43fd (patch) | |
tree | 7424d1c413279b850679c31ba9ec0c9e6fdbc5e5 /src | |
parent | 98427a19b7e820283909d3e4ae00bc9447e461fc (diff) | |
download | armnn-f2ed1b84caccb05c9e00e18b2cb2d2a2875b43fd.tar.gz |
IVGCVSW-5499 Missing validation for zero stride
* Convolution
* Depthwise Convolution
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I61b356fbffb176e9a05e08d9b6867d082b6712c8
Diffstat (limited to 'src')
-rw-r--r-- | src/armnn/layers/Convolution2dLayer.cpp | 3 | ||||
-rw-r--r-- | src/armnn/layers/DepthwiseConvolution2dLayer.cpp | 3 | ||||
-rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 16 |
3 files changed, 22 insertions, 0 deletions
diff --git a/src/armnn/layers/Convolution2dLayer.cpp b/src/armnn/layers/Convolution2dLayer.cpp index 26f11f3d0c..18557bf64e 100644 --- a/src/armnn/layers/Convolution2dLayer.cpp +++ b/src/armnn/layers/Convolution2dLayer.cpp @@ -89,6 +89,9 @@ std::vector<TensorShape> Convolution2dLayer::InferOutputShapes(const std::vector // If we support multiple batch dimensions in the future, then this assert will need to change. ARMNN_ASSERT_MSG(inputShape.GetNumDimensions() == 4, "Convolutions will always have 4D input."); + ARMNN_ASSERT( m_Param.m_StrideX > 0); + ARMNN_ASSERT( m_Param.m_StrideY > 0); + DataLayoutIndexed dataLayoutIndex(m_Param.m_DataLayout); unsigned int inWidth = inputShape[dataLayoutIndex.GetWidthIndex()]; diff --git a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp index 139d268631..ff9cebafd5 100644 --- a/src/armnn/layers/DepthwiseConvolution2dLayer.cpp +++ b/src/armnn/layers/DepthwiseConvolution2dLayer.cpp @@ -90,6 +90,9 @@ DepthwiseConvolution2dLayer::InferOutputShapes(const std::vector<TensorShape>& i ARMNN_ASSERT_MSG(inputShape.GetNumDimensions() == 4, "Convolutions will always have 4D input."); + ARMNN_ASSERT( m_Param.m_StrideX > 0); + ARMNN_ASSERT( m_Param.m_StrideY > 0); + DataLayoutIndexed dataLayoutIndex(m_Param.m_DataLayout); unsigned int inputBatchSize = inputShape[0]; diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 530dc48a74..d795e32e4b 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -1260,6 +1260,14 @@ void Convolution2dQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) co ValidateBiasTensorQuantization(biasTensorInfo, inputTensorInfo, weightTensorInfo, descriptorName); } + if (m_Parameters.m_StrideX <= 0 || m_Parameters.m_StrideY <= 0 ) + { + throw InvalidArgumentException( + fmt::format("{}: strideX (provided {}) and strideY (provided {}) " + "cannot be either negative or 0.", + descriptorName, m_Parameters.m_StrideX, m_Parameters.m_StrideY)); + } + ValidatePerAxisQuantization(inputTensorInfo, outputTensorInfo, weightTensorInfo, @@ -1320,6 +1328,14 @@ void DepthwiseConvolution2dQueueDescriptor::Validate(const WorkloadInfo& workloa descriptorName, m_Parameters.m_DilationX, m_Parameters.m_DilationX)); } + if (m_Parameters.m_StrideX <= 0 || m_Parameters.m_StrideY <= 0 ) + { + throw InvalidArgumentException( + fmt::format("{}: strideX (provided {}) and strideY (provided {}) " + "cannot be either negative or 0.", + descriptorName, m_Parameters.m_StrideX, m_Parameters.m_StrideY)); + } + const unsigned int channelIndex = (m_Parameters.m_DataLayout == DataLayout::NCHW) ? 1 : 3; // Expected weight shape: [ M, I, H, W ] - This shape does NOT depend on the data layout |