aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent ABRIOU <vincent.abriou@st.com>2020-05-27 16:26:46 +0200
committerManuel Bottini <manuel.bottini@arm.com>2020-05-28 11:21:33 +0100
commit267e65d40a063d3e4b3c86285074f34ff014def9 (patch)
tree946c4e9f8f85df4f104028b4c3f2de7051be0b14
parent30f4d9c809f3564cf995efb30116cba1e4632633 (diff)
downloadComputeLibrary-branches/arm_compute_20_05.tar.gz
move ndrange.hpp header into arm_compute directoryv20.05branches/arm_compute_20_05
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>
-rw-r--r--arm_compute/core/NEON/kernels/arm_gemm/ndrange.hpp (renamed from src/core/NEON/kernels/arm_gemm/ndrange.hpp)0
-rw-r--r--arm_compute/core/NEON/kernels/assembly/arm_gemm_compute_iface.hpp2
-rw-r--r--src/core/NEON/kernels/arm_gemm/gemm_hybrid.hpp3
-rw-r--r--src/core/NEON/kernels/arm_gemm/gemm_hybrid_quantized.hpp3
-rw-r--r--src/core/NEON/kernels/arm_gemm/gemm_native.hpp2
5 files changed, 6 insertions, 4 deletions
diff --git a/src/core/NEON/kernels/arm_gemm/ndrange.hpp b/arm_compute/core/NEON/kernels/arm_gemm/ndrange.hpp
index 4ff83fbc5..4ff83fbc5 100644
--- a/src/core/NEON/kernels/arm_gemm/ndrange.hpp
+++ b/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 7dff01003..6f345c172 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 0cb3160de..aeeed2670 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 3d7ad99d1..6897e64d4 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 c2f742b5c..fb01a731b 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"