commit 0a87936e7261fc074797111d274c40fca17d9509
author Mike Kelly <mike.kelly@arm.com> Mon Jul 29 16:56:31 2019 +0100
committer mike.kelly <mike.kelly@arm.com> Tue Jul 30 08:10:43 2019 +0000
tree 87d17283cf0930608bc2f4077b98fff8a56f68ab
parent a5e2a458d6279560bbe24deafc12db286be2ca10

IVGCVSW-3591 Fixed unexpectedly skipped SUB tests

 * A model that has Inputs with different quantized scales is not compliant with 1.1

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: Ifb8277d78f05b5ef017effa879322a08c0efc851

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 8dbfd89..8502640 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -61,7 +61,6 @@
         case V1_1::OperationType::SPACE_TO_BATCH_ND:
         case V1_1::OperationType::SQUEEZE:
         case V1_1::OperationType::STRIDED_SLICE:
-        case V1_1::OperationType::SUB:
         case V1_1::OperationType::TRANSPOSE:
             return true;
         default:
@@ -161,6 +160,8 @@
             return ConvertSoftmax(operation, model, data);
         case V1_2::OperationType::SPACE_TO_DEPTH:
             return ConvertSpaceToDepth(operation, model, data);
+        case V1_2::OperationType::SUB:
+            return ConvertSub(operation, model, data);
         case V1_2::OperationType::TANH:
             return ConvertTanH(operation, model, data);
         case V1_2::OperationType::LSTM:
@@ -1003,6 +1004,12 @@
     return SetupAndTrackLayerOutputSlot<hal_1_2::HalPolicy>(operation, 0, *layer, model, data);
 }
 
+bool HalPolicy::ConvertSub(const Operation& operation, const Model& model, ConversionData& data)
+{
+    ALOGV("hal_1_2::HalPolicy::ConvertSub()");
+    return ::ConvertSub<hal_1_2::HalPolicy>(operation, model, data);
+}
+
 bool HalPolicy::ConvertTanH(const Operation& operation, const Model& model, ConversionData& data)
 {
     ALOGV("hal_1_2::HalPolicy::ConvertTanH()");

1.2/HalPolicy.hpp

diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp
index 7468313..285a37f 100644
--- a/1.2/HalPolicy.hpp
+++ b/1.2/HalPolicy.hpp
@@ -66,6 +66,8 @@
 
     static bool ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data);
 
+    static bool ConvertSub(const Operation& operation, const Model& model, ConversionData& data);
+
     static bool ConvertTanH(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertLstm(const Operation& operation, const Model& model, ConversionData& data);