IVGCVSW-4209 Create a public API for the ArmNN Utils

 * Moved the relevant armnnUtils headers to the new location:
   include/armnnUtils
 * Update the header usage throughout the source code

!android-nn-driver:2387

Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: I2ba15cebcacafad2b5a1a7b9c3312ffc585e09d6

4 files changed, 157 insertions, 0 deletions

diff --git a/include/armnnUtils/DataLayoutIndexed.hpp b/include/armnnUtils/DataLayoutIndexed.hpp
new file mode 100644
index 0000000000..03404bda5d
--- /dev/null
+++ b/include/armnnUtils/DataLayoutIndexed.hpp
@@ -0,0 +1,72 @@
+//
+// Copyright © 2019 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <armnn/Types.hpp>
+#include <armnn/Tensor.hpp>
+
+#include <boost/assert.hpp>
+
+namespace armnnUtils
+{
+
+// Provides access to the appropriate indexes for Channels, Height and Width based on DataLayout
+class DataLayoutIndexed
+{
+public:
+    DataLayoutIndexed(armnn::DataLayout dataLayout);
+
+    armnn::DataLayout GetDataLayout()    const { return m_DataLayout; }
+    unsigned int      GetChannelsIndex() const { return m_ChannelsIndex; }
+    unsigned int      GetHeightIndex()   const { return m_HeightIndex; }
+    unsigned int      GetWidthIndex()    const { return m_WidthIndex; }
+
+    inline unsigned int GetIndex(const armnn::TensorShape& shape,
+                                 unsigned int batchIndex, unsigned int channelIndex,
+                                 unsigned int heightIndex, unsigned int widthIndex) const
+    {
+        BOOST_ASSERT( batchIndex < shape[0] || ( shape[0] == 0 && batchIndex == 0 ) );
+        BOOST_ASSERT( channelIndex < shape[m_ChannelsIndex] ||
+                    ( shape[m_ChannelsIndex] == 0 && channelIndex == 0) );
+        BOOST_ASSERT( heightIndex < shape[m_HeightIndex] ||
+                    ( shape[m_HeightIndex] == 0 && heightIndex == 0) );
+        BOOST_ASSERT( widthIndex < shape[m_WidthIndex] ||
+                    ( shape[m_WidthIndex] == 0 && widthIndex == 0) );
+
+        // Offset the given indices appropriately depending on the data layout
+        switch (m_DataLayout)
+        {
+        case armnn::DataLayout::NHWC:
+            batchIndex  *= shape[1] * shape[2] * shape[3]; // batchIndex *= heightIndex * widthIndex * channelIndex
+            heightIndex *= shape[m_WidthIndex] * shape[m_ChannelsIndex];
+            widthIndex  *= shape[m_ChannelsIndex];
+            // channelIndex stays unchanged
+            break;
+        case armnn::DataLayout::NCHW:
+        default:
+            batchIndex   *= shape[1] * shape[2] * shape[3]; // batchIndex *= heightIndex * widthIndex * channelIndex
+            channelIndex *= shape[m_HeightIndex] * shape[m_WidthIndex];
+            heightIndex  *= shape[m_WidthIndex];
+            // widthIndex stays unchanged
+            break;
+        }
+
+        // Get the value using the correct offset
+        return batchIndex + channelIndex + heightIndex + widthIndex;
+    }
+
+private:
+    armnn::DataLayout m_DataLayout;
+    unsigned int      m_ChannelsIndex;
+    unsigned int      m_HeightIndex;
+    unsigned int      m_WidthIndex;
+};
+
+// Equality methods
+bool operator==(const armnn::DataLayout& dataLayout, const DataLayoutIndexed& indexed);
+bool operator==(const DataLayoutIndexed& indexed, const armnn::DataLayout& dataLayout);
+
+} // namespace armnnUtils
diff --git a/include/armnnUtils/FloatingPointConverter.hpp b/include/armnnUtils/FloatingPointConverter.hpp
new file mode 100644
index 0000000000..cf573a2ee8
--- /dev/null
+++ b/include/armnnUtils/FloatingPointConverter.hpp
@@ -0,0 +1,23 @@
+//
+// Copyright © 2019 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <cstddef>
+
+namespace armnnUtils
+{
+
+class FloatingPointConverter
+{
+public:
+    // Converts a buffer of FP32 values to FP16, and stores in the given dstFloat16Buffer.
+    // dstFloat16Buffer should be (numElements * 2) in size
+    static void ConvertFloat32To16(const float *srcFloat32Buffer, size_t numElements, void *dstFloat16Buffer);
+
+    static void ConvertFloat16To32(const void *srcFloat16Buffer, size_t numElements, float *dstFloat32Buffer);
+};
+
+} // namespace armnnUtils
diff --git a/include/armnnUtils/Permute.hpp b/include/armnnUtils/Permute.hpp
new file mode 100644
index 0000000000..1ae00a136b
--- /dev/null
+++ b/include/armnnUtils/Permute.hpp
@@ -0,0 +1,21 @@
+//
+// Copyright © 2019 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <armnn/TensorFwd.hpp>
+#include <armnn/Types.hpp>
+
+namespace armnnUtils
+{
+
+armnn::TensorShape Permuted(const armnn::TensorShape& srcShape, const armnn::PermutationVector& mappings);
+
+armnn::TensorInfo Permuted(const armnn::TensorInfo& info, const armnn::PermutationVector& mappings);
+
+void Permute(const armnn::TensorShape& dstShape, const armnn::PermutationVector& mappings,
+             const void* src, void* dst, size_t dataTypeSize);
+
+} // namespace armnnUtils
diff --git a/include/armnnUtils/TensorUtils.hpp b/include/armnnUtils/TensorUtils.hpp
new file mode 100644
index 0000000000..fbfb8f4e1e
--- /dev/null
+++ b/include/armnnUtils/TensorUtils.hpp
@@ -0,0 +1,41 @@
+//
+// Copyright © 2019 Arm Ltd. All rights reserved.
+// SPDX-License-Identifier: MIT
+//
+
+#pragma once
+
+#include <armnn/TypesUtils.hpp>
+
+#include <boost/assert.hpp>
+
+namespace armnnUtils
+{
+armnn::TensorShape GetTensorShape(unsigned int numberOfBatches,
+                                  unsigned int numberOfChannels,
+                                  unsigned int height,
+                                  unsigned int width,
+                                  const armnn::DataLayout dataLayout);
+
+armnn::TensorInfo GetTensorInfo(unsigned int numberOfBatches,
+                                unsigned int numberOfChannels,
+                                unsigned int height,
+                                unsigned int width,
+                                const armnn::DataLayout dataLayout,
+                                const armnn::DataType dataType);
+
+std::pair<float, float> FindMinMax(armnn::ITensorHandle* tensorHandle);
+
+armnn::TensorShape ExpandDims(const armnn::TensorShape& tensorShape, int axis);
+
+unsigned int GetNumElementsBetween(const armnn::TensorShape& shape,
+                                   unsigned int firstAxisInclusive,
+                                   unsigned int lastAxisExclusive);
+
+unsigned int GetUnsignedAxis(const unsigned int inputDimension, const int axis);
+
+unsigned int GetNumElementsAfter(const armnn::TensorShape& shape, unsigned int axis);
+
+std::pair<unsigned int, std::vector<float>> GetPerAxisParams(const armnn::TensorInfo& info);
+
+} // namespace armnnUtils