diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2019-12-17 12:19:09 +0000 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2019-12-17 12:19:09 +0000 |
| commit | d486e5289921f937fb7a9c2d84ff87229fa25d43 (patch) | |
| tree | 27fdaef2b57c7aa3b04f659ef304f091b3a8eb78 | |
| parent | 14557e71d55e8d26d8c7f3e3912979b54e6e86ba (diff) | |
| download | android-nn-driver-d486e5289921f937fb7a9c2d84ff87229fa25d43.tar.gz | |
MLCE-144 Resolve CTS failures
* Re-enabled Float16
* Re-enabled Concatenation
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I03bbe978947d5282d50daa2ed9795d042dc93cb0
| -rw-r--r-- | 1.2/HalPolicy.cpp | 8 | ||||
| -rw-r--r-- | ConversionUtils.hpp | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index 6f23987e..cbd54e6f 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -27,6 +27,8 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model, return ConvertAveragePool2d(operation, model, data); case V1_2::OperationType::BATCH_TO_SPACE_ND: return ConvertBatchToSpaceNd(operation, model, data); + case V1_2::OperationType::CONCATENATION: + return ConvertConcatenation(operation, model, data); case V1_2::OperationType::CONV_2D: return ConvertConv2d(operation, model, data); case V1_2::OperationType::DEPTHWISE_CONV_2D: @@ -121,6 +123,12 @@ bool HalPolicy::ConvertBatchToSpaceNd(const Operation& operation, const Model& m return ::ConvertBatchToSpaceNd<hal_1_2::HalPolicy>(operation, model, data); } +bool HalPolicy::ConvertConcatenation(const Operation& operation, const Model& model, ConversionData& data) +{ + ALOGV("hal_1_2::HalPolicy::ConvertConcatenation()"); + return ::ConvertConcatenation<hal_1_2::HalPolicy>(operation, model, data); +} + bool HalPolicy::ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_2::HalPolicy::ConvertConv2d()"); diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp index 0cca619e..300c06f1 100644 --- a/ConversionUtils.hpp +++ b/ConversionUtils.hpp @@ -181,6 +181,7 @@ inline bool IsOperandTypeSupportedForTensors(V1_0::OperandType type) inline bool IsOperandTypeSupportedForTensors(V1_2::OperandType type) { return type == V1_2::OperandType::BOOL || + type == V1_2::OperandType::TENSOR_FLOAT16 || type == V1_2::OperandType::TENSOR_FLOAT32 || type == V1_2::OperandType::TENSOR_QUANT8_ASYMM || type == V1_2::OperandType::TENSOR_QUANT16_SYMM || |