commit b8805204fb0ea64079735921bcc0cc2b1aedfcf6
author Mike Kelly <mike.kelly@arm.com> Wed Jul 31 17:25:43 2019 +0100
committer Mike Kelly <mike.kelly@arm.com> Wed Jul 31 17:25:43 2019 +0100
tree a3cf2901ca6c2b582c9a078b631cccddc9c95453
parent d74c50550f797e9a5df0e379b5b49d9bd3b29bbd

IVGCVSW-3601 Fix skipped VTS Concatenate Tests

 * Fixed Skipped VTS Concatenate Tests.

Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I29e7dcdedefc0e9c54f86fa5de23aa714c469585

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index af310c9..575ae2b 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -25,7 +25,6 @@
     switch (static_cast<V1_0::OperationType>(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 @@
             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 @@
     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()");