commit 0629eb8198e705436a6c514751ba51a2568c7f8b
author Narumol Prangnawarat <narpra01@e125232.sheffield.arm.com> Thu Nov 12 18:27:37 2020 +0000
committer Narumol Prangnawarat <narumol.prangnawarat@arm.com> Thu Nov 12 19:39:59 2020 +0000
tree 8c1b66e005df149fdb068466babc8ecd552041ef
parent d7fdbe2306b9ebaba0aa625d8be14114f8631054

IVGCVSW-5090 Add android-nn-driver Support for Logical operators

 * Add ConvertLogicalBinary
 * Add support for LOGICAL_AND, LOGICAL_NOT, LOGICAL_OR

Signed-off-by: Narumol Prangnawarat <narumol.prangnawarat@arm.com>
Change-Id: I4dcecbebe031915b8c237fd5b9b92c8844847fb7

1.3/HalPolicy.cpp

diff --git a/1.3/HalPolicy.cpp b/1.3/HalPolicy.cpp
index 37deec3..5e456b8 100644
--- a/1.3/HalPolicy.cpp
+++ b/1.3/HalPolicy.cpp
@@ -81,6 +81,12 @@
             return ConvertComparison(operation, model, data, ComparisonOperation::LessOrEqual);
         case V1_3::OperationType::LOCAL_RESPONSE_NORMALIZATION:
             return ConvertLocalResponseNormalization(operation, model, data);
+        case V1_3::OperationType::LOGICAL_AND:
+            return ConvertLogicalBinary(operation, model, data, LogicalBinaryOperation::LogicalAnd);
+        case V1_3::OperationType::LOGICAL_NOT:
+            return ConvertElementwiseUnary(operation, model, data, UnaryOperation::LogicalNot);
+        case V1_3::OperationType::LOGICAL_OR:
+            return ConvertLogicalBinary(operation, model, data, LogicalBinaryOperation::LogicalOr);
         case V1_3::OperationType::LOGISTIC:
             return ConvertLogistic(operation, model, data);
         case V1_3::OperationType::LOG_SOFTMAX:
@@ -314,6 +320,15 @@
     return ::ConvertLocalResponseNormalization<hal_1_3::HalPolicy>(operation, model, data);
 }
 
+bool HalPolicy::ConvertLogicalBinary(const Operation& operation,
+                                     const Model& model,
+                                     ConversionData& data,
+                                     armnn::LogicalBinaryOperation logicalOperation)
+{
+    ALOGV("hal_1_3::HalPolicy::ConvertLogicalBinary()");
+    return ::ConvertLogicalBinary<hal_1_3::HalPolicy>(operation, model, data, logicalOperation);
+}
+
 bool HalPolicy::ConvertLogistic(const Operation& operation, const Model& model, ConversionData& data)
 {
     ALOGV("hal_1_3::HalPolicy::ConvertLogistic()");