From c921f6baf18ca05f14a41097b4e075e2d4fc7479 Mon Sep 17 00:00:00 2001
From: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Date: Thu, 25 Jul 2019 10:14:33 +0100
Subject: Fix verbose logging in ConvertPad

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I9b1b45f7723147456d2fb9c5b94822d581cf446e
---
 1.1/HalPolicy.cpp   | 8 +++++++-
 1.1/HalPolicy.hpp   | 1 +
 1.2/HalPolicy.cpp   | 8 +++++++-
 1.2/HalPolicy.hpp   | 2 ++
 ConversionUtils.hpp | 2 --
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/1.1/HalPolicy.cpp b/1.1/HalPolicy.cpp
index b58cda48..bbd289ee 100644
--- a/1.1/HalPolicy.cpp
+++ b/1.1/HalPolicy.cpp
@@ -86,7 +86,7 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model,
             case V1_1::OperationType::MEAN:
                 return ConvertMean(operation, model, data);
             case V1_1::OperationType::PAD:
-                return ConvertPad<hal_1_1::HalPolicy>(operation, model, data);
+                return ConvertPad(operation, model, data);
             case V1_1::OperationType::SPACE_TO_BATCH_ND:
                 return ConvertSpaceToBatchNd(operation, model, data);
             case V1_1::OperationType::SQUEEZE:
@@ -296,6 +296,12 @@ bool HalPolicy::ConvertMean(const Operation& operation, const Model& model, Conv
     return SetupAndTrackLayerOutputSlot<hal_1_1::HalPolicy>(operation, 0, *layer, model, data);
 }
 
+bool HalPolicy::ConvertPad(const Operation& operation, const Model& model, ConversionData& data)
+{
+    ALOGV("hal_1_1::HalPolicy::ConvertPad()");
+    return ::ConvertPad<hal_1_1::HalPolicy>(operation, model, data);
+}
+
 bool HalPolicy::ConvertSpaceToBatchNd(const Operation& operation, const Model& model, ConversionData& data)
 {
     ALOGV("hal_1_1::HalPolicy::ConvertSpaceToBatchNd()");
diff --git a/1.1/HalPolicy.hpp b/1.1/HalPolicy.hpp
index 827fddde..dd8558b3 100644
--- a/1.1/HalPolicy.hpp
+++ b/1.1/HalPolicy.hpp
@@ -31,6 +31,7 @@ private:
     static bool ConvertDiv(const Operation& operation, const Model& model, ConversionData& data);
     static bool ConvertSub(const Operation& operation, const Model& model, ConversionData& data);
     static bool ConvertMean(const Operation& operation, const Model& model, ConversionData& data);
+    static bool ConvertPad(const Operation& operation, const Model& model, ConversionData& data);
     static bool ConvertSpaceToBatchNd(const Operation& operation, const Model& model, ConversionData& data);
     static bool ConvertSqueeze(const Operation& operation, const Model& model, ConversionData& data);
     static bool ConvertStridedSlice(const Operation& operation, const Model& model, ConversionData& data);
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index 307475a8..2d6d7970 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -146,7 +146,7 @@ bool HalPolicy::ConvertOperation(const Operation& operation, const Model& model,
         case V1_2::OperationType::MINIMUM:
             return ConvertMinimum(operation, model, data);
         case V1_2::OperationType::PAD:
-            return ConvertPad<hal_1_2::HalPolicy>(operation, model, data);
+            return ConvertPad(operation, model, data);
         case V1_2::OperationType::PAD_V2:
             return ConvertPadV2(operation, model, data);
         case V1_2::OperationType::PRELU:
@@ -614,6 +614,12 @@ bool HalPolicy::ConvertMinimum(const Operation& operation, const Model& model, C
                                                             armnn::Optional<armnn::TensorInfo>(outputInfo));
 }
 
+bool HalPolicy::ConvertPad(const Operation& operation, const Model& model, ConversionData& data)
+{
+    ALOGV("hal_1_2::HalPolicy::ConvertPad()");
+    return ::ConvertPad<hal_1_2::HalPolicy>(operation, model, data);
+}
+
 bool HalPolicy::ConvertPadV2(const Operation& operation, const Model& model, ConversionData& data)
 {
     ALOGV("hal_1_2::HalPolicy::ConvertPadV2()");
diff --git a/1.2/HalPolicy.hpp b/1.2/HalPolicy.hpp
index 3c4906cb..bac765da 100644
--- a/1.2/HalPolicy.hpp
+++ b/1.2/HalPolicy.hpp
@@ -39,6 +39,8 @@ private:
 
     static bool ConvertMinimum(const Operation& operation, const Model& model, ConversionData& data);
 
+    static bool ConvertPad(const Operation& operation, const Model& model, ConversionData& data);
+
     static bool ConvertPadV2(const Operation& operation, const Model& model, ConversionData& data);
 
     static bool ConvertPrelu(const Operation& operation, const Model& model, ConversionData& data);
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index fa686a6f..f84dc108 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -1657,8 +1657,6 @@ template<typename HalPolicy,
          typename HalModel     = typename HalPolicy::Model>
 bool ConvertPad(HalOperation& operation, const HalModel& model, ConversionData& data)
 {
-    ALOGV("hal_1_1::HalPolicy::ConvertPad()");
-
     LayerInputHandle input = ConvertToLayerInputHandle<HalPolicy>(operation, 0, model, data);
     if (!input.IsValid())
     {
-- 
cgit v1.2.1