commit 8edb16d884530e7f35d05983e1617c13d200bb91
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Tue Oct 01 13:34:59 2019 +0100
committer Kevin May <kevin.may@arm.com> Wed Oct 02 10:01:14 2019 +0000
tree 2eaceaac47e6dcbc7702d79e6131337ce8832ea0
parent 09a42255247ace7b317b869cf7d5747aca85d6ef

IVGCVSW-3737 Add support for converting DEPTH_TO_SPACE

* Added ConvertDepthToSpace() to hal_1_0::HalPolicy and hal_1_2::HalPolicy
* Implemented ConvertDepthToSpace() template inside ConversionUtils.hpp
* Changed unsupported operation from DEPTH_TO_SPACE to HASHTABLE_LOOKUP
  in GenericLayerTests/GetSupportedOperations

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I12bf73ea721e7b6d49cc4a76000b43a3f274c6f5

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 7aa6967..d91cb3b 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -34,6 +34,8 @@
             return ConvertConcatenation(operation, model, data);
         case V1_2::OperationType::CONV_2D:
             return ConvertConv2d(operation, model, data);
+        case V1_2::OperationType::DEPTH_TO_SPACE:
+            return ConvertDepthToSpace(operation, model, data);
         case V1_2::OperationType::DEPTHWISE_CONV_2D:
             return ConvertDepthwiseConv2d(operation, model, data);
         case V1_2::OperationType::DEQUANTIZE:
@@ -298,6 +300,12 @@
     return SetupAndTrackLayerOutputSlot<hal_1_2::HalPolicy>(operation, 0, *endLayer, model, data);
 }
 
+bool HalPolicy::ConvertDepthToSpace(const Operation& operation, const Model& model, ConversionData& data)
+{
+    ALOGV("hal_1_2::HalPolicy::ConvertDepthToSpace()");
+    return ::ConvertDepthToSpace<hal_1_2::HalPolicy>(operation, model, data);
+}
+
 bool HalPolicy::ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data)
 {
     ALOGV("hal_1_2::HalPolicy::ConvertDepthwiseConv2d()");

1.2/HalPolicy.hpp

diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp
index c7e1d4b..82de44c 100644
--- a/1.2/HalPolicy.hpp
+++ b/1.2/HalPolicy.hpp
@@ -43,6 +43,8 @@
 
     static bool ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data);
 
+    static bool ConvertDepthToSpace(const Operation& operation, const Model& model, ConversionData& data);
+
     static bool ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertDequantize(const Operation& operation, const Model& model, ConversionData& data);