commit 701d9a0b7316d9b31e05f9238fd8b389d89066ee
author Sadik Armagan <sadik.armagan@arm.com> Wed Sep 04 15:16:18 2019 +0100
committer Sadik Armagan <sadik.armagan@arm.com> Wed Sep 04 15:16:18 2019 +0100
tree d62f4fab389e3d28fe2778f8557d97fdfba22252
parent d1b016e2643fa6be8389340b5ca901dadaa98983

IVGCVSW-3660 Add SQRT to the android-nn-driver

 * Implemented Convert() function for SQRT operator
 * Fixed some typos in HAL 1.2 Policy

Change-Id: I1e0bc7a43622c52f053927248ee1a71cb797145e
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index e08ae84..7bad22d 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -83,6 +83,8 @@
             return ConvertResize(operation, model, data, armnn::ResizeMethod::Bilinear);
         case V1_2::OperationType::RESIZE_NEAREST_NEIGHBOR:
             return ConvertResize(operation, model, data, armnn::ResizeMethod::NearestNeighbor);
+        case V1_2::OperationType::SQRT:
+            return ConvertSqrt(operation, model, data);
         case V1_2::OperationType::SQUEEZE:
             return ConvertSqueeze(operation, model, data);
         case V1_2::OperationType::STRIDED_SLICE:
@@ -1739,21 +1741,30 @@
             SetupAndTrackLayerOutputSlot<hal_1_2::HalPolicy>(operation, 3, *layer, 3, model, data));
 }
 
+bool HalPolicy::ConvertSqrt(const Operation& operation, const Model& model, ConversionData& data)
+{
+    ALOGV("hal_1_2::HalPolicy::ConvertSqrt()");
+    armnn::ActivationDescriptor desc;
+    desc.m_Function = armnn::ActivationFunction::Sqrt;
+
+    return ::ConvertToActivation<hal_1_2::HalPolicy>(operation, __func__, desc, model, data);
+}
+
 bool HalPolicy::ConvertSqueeze(const Operation& operation, const Model& model, ConversionData& data)
 {
-    ALOGV("hal_1_1::HalPolicy::ConvertSqueeze()");
+    ALOGV("hal_1_2::HalPolicy::ConvertSqueeze()");
     return ::ConvertSqueeze<hal_1_2::HalPolicy>(operation, model, data);
 }
 
 bool HalPolicy::ConvertStridedSlice(const Operation& operation, const Model& model, ConversionData& data)
 {
-    ALOGV("hal_1_1::HalPolicy::ConvertStridedSlice()");
+    ALOGV("hal_1_2::HalPolicy::ConvertStridedSlice()");
     return ::ConvertStridedSlice<hal_1_2::HalPolicy>(operation, model, data);
 }
 
 bool HalPolicy::ConvertTranspose(const Operation& operation, const Model& model, ConversionData& data)
 {
-    ALOGV("hal_1_1::HalPolicy::ConvertTranspose()");
+    ALOGV("hal_1_2::HalPolicy::ConvertTranspose()");
     return ::ConvertTranspose<hal_1_2::HalPolicy>(operation, model, data);
 }
 

1.2/HalPolicy.hpp

diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp
index 4a785d9..5c8a61e 100644
--- a/1.2/HalPolicy.hpp
+++ b/1.2/HalPolicy.hpp
@@ -102,6 +102,8 @@
 
     static bool ConvertSpaceToDepth(const Operation& operation, const Model& model, ConversionData& data);
 
+    static bool ConvertSqrt(const Operation& operation, const Model& model, ConversionData& data);
+
     static bool ConvertSqueeze(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertStridedSlice(const Operation& operation, const Model& model, ConversionData& data);

NnapiSupport.txt

diff --git a/NnapiSupport.txt b/NnapiSupport.txt
index f198796..50d99b1 100644
--- a/NnapiSupport.txt
+++ b/NnapiSupport.txt
@@ -47,6 +47,7 @@
 SOFTMAX                      (FLOAT32,QUANT8_ASYMM)
 SPACE_TO_BATCH_ND            (FLOAT32,QUANT8_ASYMM)
 SPACE_TO_DEPTH_ND            (FLOAT32,QUANT8_ASYMM)
+SQRT                         (FLOAT32)
 SQUEEZE                      (FLOAT32,QUANT8_ASYMM)
 STRIDED_SLICE                (FLOAT32,QUANT8_ASYMM)
 SUB                          (FLOAT32,QUANT8_ASYMM)