commit f356905c37c9301a7680490afdf6774100c99ea1
author Aron Virginas-Tar <Aron.Virginas-Tar@arm.com> Fri Jul 05 16:01:08 2019 +0100
committer Áron Virginás-Tar <aron.virginas-tar@arm.com> Fri Jul 05 15:39:01 2019 +0000
tree 8a5604f6e4183adcefb16355ff70cce3e6237c6b
parent 33fa0a66a57ddfd1896478301de7ee047aae5e89

Fix member name in PadDescriptor

* Renamed m_padValue to m_PadValue to bring it in line with
  our naming conventions

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

include/armnn/Descriptors.hpp

diff --git a/include/armnn/Descriptors.hpp b/include/armnn/Descriptors.hpp
index 9175239..cb76615 100644
--- a/include/armnn/Descriptors.hpp
+++ b/include/armnn/Descriptors.hpp
@@ -631,11 +631,11 @@
 /// A PadDescriptor for the PadLayer.
 struct PadDescriptor
 {
-    PadDescriptor() : m_padValue(0)
+    PadDescriptor() : m_PadValue(0)
     {}
 
     PadDescriptor(const std::vector<std::pair<unsigned int, unsigned int>>& padList, const float& padValue = 0)
-    : m_PadList(padList), m_padValue(padValue)
+    : m_PadList(padList), m_PadValue(padValue)
     {}
 
     /// @brief Specifies the padding for input dimension.
@@ -645,7 +645,7 @@
     std::vector<std::pair<unsigned int, unsigned int>> m_PadList;
 
     /// Optional value to use for padding, defaults to 0
-    float m_padValue;
+    float m_PadValue;
 };
 
 /// A StridedSliceDescriptor for the StridedSliceLayer.

src/armnnSerializer/Serializer.cpp

diff --git a/src/armnnSerializer/Serializer.cpp b/src/armnnSerializer/Serializer.cpp
index 57d6740..c9719aa 100644
--- a/src/armnnSerializer/Serializer.cpp
+++ b/src/armnnSerializer/Serializer.cpp
@@ -578,7 +578,7 @@
 
     auto flatBufferPadDesc = serializer::CreatePadDescriptor(m_flatBufferBuilder,
                                                              m_flatBufferBuilder.CreateVector(padList),
-                                                             padDescriptor.m_padValue);
+                                                             padDescriptor.m_PadValue);
 
     auto flatBufferPadLayer = serializer::CreatePadLayer(m_flatBufferBuilder,
                                                          flatBufferBaseLayer,

src/armnnSerializer/test/SerializerTests.cpp

diff --git a/src/armnnSerializer/test/SerializerTests.cpp b/src/armnnSerializer/test/SerializerTests.cpp
index 285d21c..33f10ef 100644
--- a/src/armnnSerializer/test/SerializerTests.cpp
+++ b/src/armnnSerializer/test/SerializerTests.cpp
@@ -1712,7 +1712,7 @@
     void VerifyDescriptor(const armnn::PadDescriptor& descriptor)
     {
         BOOST_TEST(descriptor.m_PadList == m_Descriptor.m_PadList);
-        BOOST_TEST(descriptor.m_padValue == m_Descriptor.m_padValue);
+        BOOST_TEST(descriptor.m_PadValue == m_Descriptor.m_PadValue);
     }
 
     armnn::PadDescriptor m_Descriptor;

src/backends/reference/workloads/RefPadWorkload.cpp

diff --git a/src/backends/reference/workloads/RefPadWorkload.cpp b/src/backends/reference/workloads/RefPadWorkload.cpp
index 8cb9d88..e9724c4 100644
--- a/src/backends/reference/workloads/RefPadWorkload.cpp
+++ b/src/backends/reference/workloads/RefPadWorkload.cpp
@@ -30,7 +30,7 @@
     const T* inputData = GetInputTensorData<T>(0, m_Data);
     T* outputData = GetOutputTensorData<T>(0, m_Data);
 
-    Pad(inputInfo, outputInfo, m_Data.m_Parameters.m_PadList, inputData, outputData, m_Data.m_Parameters.m_padValue);
+    Pad(inputInfo, outputInfo, m_Data.m_Parameters.m_PadList, inputData, outputData, m_Data.m_Parameters.m_PadValue);
 }
 
 template class RefPadWorkload<DataType::Float32>;