move ndrange.hpp header into arm_compute directory
ndrange.hpp file is needed by arm_gemm_compute_iface.hpp when building
armnn.
In a cross compilation environment like Yocto Openembedded, the installed
include files comes from either /arm_compute, /include or /support
directories.
So to avoid armnn build failure, ndrange.hpp need to be moved in
arm_compute/core/NEON/kernels/arm_gemm directory.
Other files that need ndrange.hpp to build are updated accordingly.
Signed-off-by: Vincent ABRIOU <vincent.abriou@st.com>
Change-Id: Icc8e18b23dd06c56e0c49a84d4a51bfd85fe2290
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3271
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Manuel Bottini <manuel.bottini@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
diff --git a/src/core/NEON/kernels/arm_gemm/ndrange.hpp b/arm_compute/core/NEON/kernels/arm_gemm/ndrange.hpp
similarity index 100%
rename from src/core/NEON/kernels/arm_gemm/ndrange.hpp
rename to arm_compute/core/NEON/kernels/arm_gemm/ndrange.hpp
diff --git a/arm_compute/core/NEON/kernels/assembly/arm_gemm_compute_iface.hpp b/arm_compute/core/NEON/kernels/assembly/arm_gemm_compute_iface.hpp
index 7dff010..6f345c1 100644
--- a/arm_compute/core/NEON/kernels/assembly/arm_gemm_compute_iface.hpp
+++ b/arm_compute/core/NEON/kernels/assembly/arm_gemm_compute_iface.hpp
@@ -25,7 +25,7 @@
#include "arm_compute/core/Window.h"
#include "arm_compute/core/Dimensions.h"
-#include "src/core/NEON/kernels/arm_gemm/ndrange.hpp"
+#include "arm_compute/core/NEON/kernels/arm_gemm/ndrange.hpp"
#include <cassert>
diff --git a/src/core/NEON/kernels/arm_gemm/gemm_hybrid.hpp b/src/core/NEON/kernels/arm_gemm/gemm_hybrid.hpp
index 0cb3160..aeeed26 100644
--- a/src/core/NEON/kernels/arm_gemm/gemm_hybrid.hpp
+++ b/src/core/NEON/kernels/arm_gemm/gemm_hybrid.hpp
@@ -29,9 +29,10 @@
#include "arm_gemm.hpp"
#include "bias_adder.hpp"
-#include "ndrange.hpp"
#include "utils.hpp"
+#include "arm_compute/core/NEON/kernels/arm_gemm/ndrange.hpp"
+
#include "mergeresults.hpp"
#include "transform.hpp"
diff --git a/src/core/NEON/kernels/arm_gemm/gemm_hybrid_quantized.hpp b/src/core/NEON/kernels/arm_gemm/gemm_hybrid_quantized.hpp
index 3d7ad99..6897e64 100644
--- a/src/core/NEON/kernels/arm_gemm/gemm_hybrid_quantized.hpp
+++ b/src/core/NEON/kernels/arm_gemm/gemm_hybrid_quantized.hpp
@@ -28,9 +28,10 @@
#include <algorithm>
#include "arm_gemm.hpp"
-#include "ndrange.hpp"
#include "utils.hpp"
+#include "arm_compute/core/NEON/kernels/arm_gemm/ndrange.hpp"
+
#include "mergeresults.hpp"
#include "transform.hpp"
diff --git a/src/core/NEON/kernels/arm_gemm/gemm_native.hpp b/src/core/NEON/kernels/arm_gemm/gemm_native.hpp
index c2f742b..fb01a73 100644
--- a/src/core/NEON/kernels/arm_gemm/gemm_native.hpp
+++ b/src/core/NEON/kernels/arm_gemm/gemm_native.hpp
@@ -27,7 +27,7 @@
#include "arm_gemm.hpp"
-#include "ndrange.hpp"
+#include "arm_compute/core/NEON/kernels/arm_gemm/ndrange.hpp"
#ifdef CYCLE_PROFILING
#include "profiler.hpp"