commit cd700e4f0db201bc3066605058dc1c87d483833f
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Fri Jun 14 14:54:52 2019 +0100
committer Áron Virginás-Tar <aron.virginas-tar@arm.com> Fri Jun 14 14:04:58 2019 +0000
tree 9aeb9d488391d1010165478c0cb7d9397c7f2c76
parent e205318c65191990ad5f3e388a0301bc91d88696

IVGCVSW-3280 Refactor conversion methods to depend only on HalPolicy

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

1.2/HalPolicy.cpp

diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index abc0cfc..11a1cef 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -131,9 +131,9 @@
     switch (operation.type)
     {
         case V1_2::OperationType::CONV_2D:
-            return ConvertConv2d<Operand, OperandType, Operation, Model>(operation, model, data);
+            return ConvertConv2d<hal_1_2::HalPolicy>(operation, model, data);
         case V1_2::OperationType::DEPTHWISE_CONV_2D:
-            return ConvertDepthwiseConv2d<Operand, OperandType, Operation, Model>(operation, model, data);
+            return ConvertDepthwiseConv2d<hal_1_2::HalPolicy>(operation, model, data);
         default:
             return Fail("%s: Operation type %s not supported in ArmnnDriver",
                         __func__, toString(operation.type).c_str());

1.2/HalPolicy.hpp

diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp
index d27e4c7..e6001c4 100644
--- a/1.2/HalPolicy.hpp
+++ b/1.2/HalPolicy.hpp
@@ -19,6 +19,8 @@
 public:
     using Model                     = V1_2::Model;
     using Operand                   = V1_2::Operand;
+    using OperandLifeTime           = V1_0::OperandLifeTime;
+    using OperandType               = V1_2::OperandType;
     using Operation                 = V1_2::Operation;
     using OperationType             = V1_2::OperationType;
     using ExecutionCallback         = V1_2::IExecutionCallback;