diff options
author | Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> | 2019-10-01 13:34:59 +0100 |
---|---|---|
committer | Kevin May <kevin.may@arm.com> | 2019-10-02 10:01:14 +0000 |
commit | 8edb16d884530e7f35d05983e1617c13d200bb91 (patch) | |
tree | 2eaceaac47e6dcbc7702d79e6131337ce8832ea0 /1.0 | |
parent | 09a42255247ace7b317b869cf7d5747aca85d6ef (diff) | |
download | android-nn-driver-8edb16d884530e7f35d05983e1617c13d200bb91.tar.gz |
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
Diffstat (limited to '1.0')
-rw-r--r-- | 1.0/HalPolicy.cpp | 8 | ||||
-rw-r--r-- | 1.0/HalPolicy.hpp | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/1.0/HalPolicy.cpp b/1.0/HalPolicy.cpp index cff678a8..7e9e9efa 100644 --- a/1.0/HalPolicy.cpp +++ b/1.0/HalPolicy.cpp @@ -27,6 +27,8 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, return ConvertConcatenation(operation, model, data); case V1_0::OperationType::CONV_2D: return ConvertConv2d(operation, model, data); + case V1_0::OperationType::DEPTH_TO_SPACE: + return ConvertDepthToSpace(operation, model, data); case V1_0::OperationType::DEPTHWISE_CONV_2D: return ConvertDepthwiseConv2d(operation, model, data); case V1_0::OperationType::DEQUANTIZE: @@ -95,6 +97,12 @@ bool HalPolicy::ConvertConv2d(const Operation& operation, const Model& model, Co return ::ConvertConv2d<hal_1_0::HalPolicy>(operation, model, data); } +bool HalPolicy::ConvertDepthToSpace(const Operation& operation, const Model& model, ConversionData& data) +{ + ALOGV("hal_1_0::HalPolicy::ConvertDepthToSpace()"); + return ::ConvertDepthToSpace<hal_1_0::HalPolicy>(operation, model, data); +} + bool HalPolicy::ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_0::HalPolicy::ConvertDepthwiseConv2d()"); diff --git a/1.0/HalPolicy.hpp b/1.0/HalPolicy.hpp index 4b8dc47a..9eb13b47 100644 --- a/1.0/HalPolicy.hpp +++ b/1.0/HalPolicy.hpp @@ -38,6 +38,8 @@ private: 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); |