From b8805204fb0ea64079735921bcc0cc2b1aedfcf6 Mon Sep 17 00:00:00 2001 From: Mike Kelly Date: Wed, 31 Jul 2019 17:25:43 +0100 Subject: IVGCVSW-3601 Fix skipped VTS Concatenate Tests * Fixed Skipped VTS Concatenate Tests. Signed-off-by: Mike Kelly Change-Id: I29e7dcdedefc0e9c54f86fa5de23aa714c469585 --- 1.2/HalPolicy.cpp | 9 ++++++++- 1.2/HalPolicy.hpp | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to '1.2') diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp index af310c93..575ae2b2 100644 --- a/1.2/HalPolicy.cpp +++ b/1.2/HalPolicy.cpp @@ -25,7 +25,6 @@ bool HandledByV1_0(V1_2::OperationType operationType) switch (static_cast(operationType)) { case V1_0::OperationType::ADD: - case V1_0::OperationType::CONCATENATION: case V1_0::OperationType::DEPTH_TO_SPACE: case V1_0::OperationType::DEQUANTIZE: case V1_0::OperationType::EMBEDDING_LOOKUP: @@ -128,6 +127,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: @@ -190,6 +191,12 @@ bool HalPolicy::ConvertBatchToSpaceNd(const Operation& operation, const Model& m return ::ConvertBatchToSpaceNd(operation, model, data); } +bool HalPolicy::ConvertConcatenation(const Operation& operation, const Model& model, ConversionData& data) +{ + ALOGV("hal_1_2::HalPolicy::ConvertConcatenation()"); + return ::ConvertConcatenation(operation, model, data); +} + bool HalPolicy::ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data) { ALOGV("hal_1_2::HalPolicy::ConvertConv2d()"); diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp index 8b8d501c..4b1ab073 100644 --- a/1.2/HalPolicy.hpp +++ b/1.2/HalPolicy.hpp @@ -35,6 +35,8 @@ private: static bool ConvertBatchToSpaceNd(const Operation& operation, const Model& model, ConversionData& data); + static bool ConvertConcatenation(const Operation& operation, const Model& model, ConversionData& data); + static bool ConvertConv2d(const Operation& operation, const Model& model, ConversionData& data); static bool ConvertDepthwiseConv2d(const Operation& operation, const Model& model, ConversionData& data); -- cgit v1.2.1