aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Martincigh <matteo.martincigh@arm.com>2019-11-28 17:13:24 +0000
committerMatteo Martincigh <matteo.martincigh@arm.com>2019-11-28 17:27:01 +0000
commit00d6ed157bb83330da5dbfb3737b0e5dcd3fbeb0 (patch)
tree3d16d2eb6366d7ee0a8be038c7c4b496a78c6869
parentc4aacb3d3a4c7566203751e2f2cc7204d3104f2f (diff)
downloadandroid-nn-driver-00d6ed157bb83330da5dbfb3737b0e5dcd3fbeb0.tar.gz
IVGCVSW-4209 Create a public API for the ArmNN Utils
* Using the new public armnnUtils API !armnn:2386 Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com> Change-Id: Ifa8af20ca131b1be19dbdceea6674a1274a396f3
-rw-r--r--1.2/HalPolicy.cpp10
-rw-r--r--ConversionUtils.hpp4
-rw-r--r--Utils.cpp3
3 files changed, 9 insertions, 8 deletions
diff --git a/1.2/HalPolicy.cpp b/1.2/HalPolicy.cpp
index e6f8acbb..60bbf1d5 100644
--- a/1.2/HalPolicy.cpp
+++ b/1.2/HalPolicy.cpp
@@ -4,15 +4,15 @@
//
#include "HalPolicy.hpp"
-
#include "Utils.hpp"
-#include <DataLayoutIndexed.hpp>
-#include <Half.hpp>
-#include <TensorUtils.hpp>
-
#include <armnn/TypesUtils.hpp>
+#include <armnnUtils/DataLayoutIndexed.hpp>
+#include <armnnUtils/TensorUtils.hpp>
+
+#include <Half.hpp>
+
#include <cmath>
#include <string>
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 12a8826e..9b24dc1d 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -11,8 +11,8 @@
#include <armnn/ILayerSupport.hpp>
#include <armnn/BackendHelper.hpp>
-#include "armnn/src/armnnUtils/DataLayoutIndexed.hpp"
-#include "armnn/src/armnnUtils/Permute.hpp"
+#include <armnnUtils/DataLayoutIndexed.hpp>
+#include <armnnUtils/Permute.hpp>
#include "1.0/FullyConnected.hpp"
diff --git a/Utils.cpp b/Utils.cpp
index 229f35b6..ee46aea0 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -7,8 +7,9 @@
#include "Utils.hpp"
+#include <armnnUtils/Permute.hpp>
+
#include <Half.hpp>
-#include <Permute.hpp>
#include <cassert>
#include <cinttypes>