commit 0e4e43956687bda724339a5243a82f53b7154a5c
author Finn Williams <Finn.Williams@arm.com> Wed Jul 31 10:56:27 2019 +0100
committer Finn Williams <Finn.Williams@arm.com> Wed Jul 31 11:57:29 2019 +0100
tree 93c7e4f63677ca41b1e8b063b469c0fbef5b4474
parent 23b87b33b28fc862ac99c8ae2cfc33b923b6490e

IVGCVSW-3583 Correct data layout index for ConvertBatchToSpaceNd

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: Ibd683c147b6f2fb966a8f90105c9213880100cf8

ConversionUtils.hpp

diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 946bc95..2b2a8ce 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -1802,13 +1802,12 @@
 
 template<typename HalPolicy,
          typename HalOperation   = typename HalPolicy::Operation,
+         typename HalOperand     = typename HalPolicy::Operand,
          typename HalModel       = typename HalPolicy::Model>
 bool ConvertBatchToSpaceNd(const HalOperation& operation,
                            const HalModel& model,
                            ConversionData& data)
 {
-    using HalOperand     = typename HalPolicy::Operand;
-    using HalOperandType = typename HalPolicy::OperandType;
 
     LayerInputHandle input = ConvertToLayerInputHandle<HalPolicy>(operation, 0, model, data);
     if (!input.IsValid())
@@ -1861,7 +1860,7 @@
 
     if (Is12Operand(*output))
     {
-        batchToSpaceNdDesc.m_DataLayout = OptionalDataLayout<HalPolicy>(operation, 3, model, data);
+        batchToSpaceNdDesc.m_DataLayout = OptionalDataLayout<HalPolicy>(operation, 2, model, data);
     }
     // Setting crops to 0,0 0,0 as it is not supported in Android NN API
     batchToSpaceNdDesc.m_Crops = {{0, 0}, {0, 0}};