commit d74c50550f797e9a5df0e379b5b49d9bd3b29bbd
author Finn Williams <Finn.Williams@arm.com> Tue Jul 30 17:06:00 2019 +0100
committer Áron Virginás-Tar <aron.virginas-tar@arm.com> Wed Jul 31 12:40:31 2019 +0000
tree 4f8422ad9f6476697e794a95d165562f14875a36
parent 8b99168ba5253f454d17125d3c72dacf8db9fb2a

IVGCVSW-3586 Fix Skipped Space_To_Batch Hal 1.2 VTS Failures

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

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 03a6446..af310c9 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -57,7 +57,6 @@
     {
         case V1_1::OperationType::DIV:
         case V1_1::OperationType::MEAN:
-        case V1_1::OperationType::SPACE_TO_BATCH_ND:
         case V1_1::OperationType::SQUEEZE:
         case V1_1::OperationType::STRIDED_SLICE:
         case V1_1::OperationType::TRANSPOSE:
@@ -163,6 +162,8 @@
             return ConvertTransposeConv2d(operation, model, data);
         case V1_2::OperationType::SOFTMAX:
             return ConvertSoftmax(operation, model, data);
+        case V1_2::OperationType::SPACE_TO_BATCH_ND  :
+            return ConvertSpaceToBatchNd(operation, model, data);
         case V1_2::OperationType::SPACE_TO_DEPTH:
             return ConvertSpaceToDepth(operation, model, data);
         case V1_2::OperationType::SUB:
@@ -938,6 +939,12 @@
     return SetupAndTrackLayerOutputSlot<hal_1_2::HalPolicy>(operation, 0, *layer, model, data);
 }
 
+bool HalPolicy::ConvertSpaceToBatchNd(const Operation& operation, const Model& model, ConversionData& data)
+{
+    ALOGV("hal_1_2::HalPolicy::ConvertSpaceToBatchNd()");
+    return ::ConvertSpaceToBatchNd<hal_1_2::HalPolicy>(operation, model, data);
+}
+
 bool HalPolicy::ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data)
 {
     ALOGV("hal_1_2::HalPolicy::ConvertSpaceToDepth()");

1.2/HalPolicy.hpp

diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp
index 409f7b4..8b8d501 100644
--- a/1.2/HalPolicy.hpp
+++ b/1.2/HalPolicy.hpp
@@ -68,6 +68,8 @@
 
     static bool ConvertSoftmax(const Operation& operation, const Model& model, ConversionData& data);
 
+    static bool ConvertSpaceToBatchNd(const Operation& operation, const Model& model, ConversionData& data);
+
     static bool ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertSub(const Operation& operation, const Model& model, ConversionData& data);