commit c8bdb3943635a7beb0fdc8538803c8e61a3abe33
author Narumol Prangnawarat <narumol.prangnawarat@arm.com> Thu Aug 01 15:51:44 2019 +0100
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Fri Aug 02 14:24:00 2019 +0000
tree 691ae75b3a7160be7f98bc839846523287e9a7a4
parent f094dba07b1e1dd65d8b85adcbbd98f2d77cb07a

IVGCVSW-3604 Fix TransposeConv2d padding calculation

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Signed-off-by: Aron Virginas-Tar <aron.virginas-tar@arm.com>
Change-Id: I5c10ab18343ecf0ebeab24a436e5be2b6c2831c7

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 575ae2b..477806e 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -1607,11 +1607,28 @@
 
         const uint32_t kernelX = weights.GetShape()[widthIndex];
         const uint32_t kernelY = weights.GetShape()[heightIndex];
-        const uint32_t inputX  = inputInfo.GetShape()[widthIndex];
-        const uint32_t inputY  = inputInfo.GetShape()[heightIndex];
+        const uint32_t outputX  = outputInfo.GetShape()[widthIndex];
+        const uint32_t outputY  = outputInfo.GetShape()[heightIndex];
 
-        CalcPadding(inputX, kernelX, desc.m_StrideX, desc.m_PadLeft, desc.m_PadRight, paddingScheme);
-        CalcPadding(inputY, kernelY, desc.m_StrideY, desc.m_PadTop, desc.m_PadBottom, paddingScheme);
+        int32_t padLeft{0};
+        int32_t padRight{0};
+        int32_t padTop{0};
+        int32_t padBottom{0};
+
+        CalcPaddingTransposeConv(outputX, kernelX, desc.m_StrideX, padLeft, padRight, paddingScheme);
+        CalcPaddingTransposeConv(outputY, kernelY, desc.m_StrideY, padTop, padBottom, paddingScheme);
+
+        // NOTE: The Android NN API allows for negative padding values in TransposeConv2d,
+        // but Arm NN only supports values >= 0
+        if (padLeft < 0 || padRight < 0 || padTop < 0 || padBottom < 0)
+        {
+            return Fail("%s: Negative padding values are not supported", __func__);
+        }
+
+        desc.m_PadLeft   = boost::numeric_cast<uint32_t>(padLeft);
+        desc.m_PadRight  = boost::numeric_cast<uint32_t>(padRight);
+        desc.m_PadTop    = boost::numeric_cast<uint32_t>(padTop);
+        desc.m_PadBottom = boost::numeric_cast<uint32_t>(padBottom);
     }
     else if (operation.inputs.size() == 11)
     {

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 18a6541..9471d78 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -323,6 +323,12 @@
     outPadTail = boost::numeric_cast<uint32_t>(padTail);
 }
 
+void CalcPaddingTransposeConv(uint32_t output, uint32_t kernel, uint32_t stride, int32_t& outPadHead,
+                              int32_t& outPadTail, android::nn::PaddingScheme scheme)
+{
+    calculateExplicitPaddingTransposeConv(output, stride, kernel, scheme, &outPadHead, &outPadTail);
+}
+
 #endif
 
 Shape GetOperandShape(const V1_0::Operand& operand)