From 8a1b2184f7261eba82ad8346a3ec8bb7d5800f57 Mon Sep 17 00:00:00 2001 From: Aron Virginas-Tar Date: Thu, 19 Sep 2019 14:39:37 +0100 Subject: Fix some minor issues around SpaceToDepth * Removed unnecessary code from SpaceToDepthLayer::InferOutputShapes() * Refactored SpaceToDepthQueueDescriptor::Validate() and added extra checks for block size and output depth Signed-off-by: Aron Virginas-Tar Change-Id: Ieeed3144e2589b2e8695ef65ce17752bc595332f --- src/backends/backendsCommon/WorkloadData.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'src/backends') diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 52d14097af..3fbdec7bf9 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -1408,29 +1408,31 @@ void SpaceToDepthQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) con ValidateDataTypes(inputTensorInfo, supportedTypes, descriptorName); ValidateDataTypes(outputTensorInfo, supportedTypes, descriptorName); + ValidateTensorNumElementsMatch(inputTensorInfo, outputTensorInfo, descriptorName, "input", "output"); + + if (m_Parameters.m_BlockSize == 0) + { + throw InvalidArgumentException(descriptorName + ": Block size cannot be 0."); + } + DataLayoutIndexed dimensionIndices(m_Parameters.m_DataLayout); const unsigned int wIndex = dimensionIndices.GetWidthIndex(); const unsigned int hIndex = dimensionIndices.GetHeightIndex(); const unsigned int cIndex = dimensionIndices.GetChannelsIndex(); const TensorShape& inputShape = inputTensorInfo.GetShape(); - - const unsigned int numInputElements = - inputShape[0] * inputShape[wIndex] * inputShape[hIndex] * inputShape[cIndex]; - const unsigned int numOutputElements = outputTensorInfo.GetNumElements(); - - if (numOutputElements != numInputElements) - { - throw InvalidArgumentException(descriptorName + ": Input tensor has " + - std::to_string(numInputElements) + " but output tensor has " + - std::to_string(numOutputElements) + " elements."); - } - if (inputShape[hIndex] % m_Parameters.m_BlockSize != 0 || inputShape[wIndex] % m_Parameters.m_BlockSize != 0) { throw InvalidArgumentException(descriptorName + ": Input shape must be divisible " "by block size in all spatial dimensions"); } + + const TensorShape& outputShape = outputTensorInfo.GetShape(); + if (outputShape[cIndex] % (m_Parameters.m_BlockSize * m_Parameters.m_BlockSize) != 0) + { + throw InvalidArgumentException(descriptorName + ": The depth of the output tensor" + "must be divisible by the square of block size." ); + } } void FloorQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) const -- cgit v1.2.1