COMPMID-3639: (3RDPARTY_UPDATE) Move CL kernels to src
authorFrancis Murtagh <francis.murtagh@arm.com>
Wed, 4 Nov 2020 13:33:41 +0000 (13:33 +0000)
committerFrancis Murtagh <francis.murtagh@arm.com>
Sun, 8 Nov 2020 17:07:00 +0000 (17:07 +0000)
 * Change file Armnn GlobalConfig.cmake uses to find ARMCOMPUTE_INCLUDE
 * Original file has been moved and no longer visible

Signed-off-by: Francis Murtagh <francis.murtagh@arm.com>
Change-Id: I91c1376124dad2b2db764f83c421a1cc110e5dd1

cmake/GlobalConfig.cmake

index 3fb12df..01ce91f 100644 (file)
@@ -246,12 +246,12 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/profiling)
 # Note that ARM Compute has a different folder layout depending on the branch but also on
 # whether it comes from a prepackaged archive (this is why we add several hints below)
 if(ARMCOMPUTENEON OR ARMCOMPUTECL)
-    find_path(ARMCOMPUTE_INCLUDE arm_compute/core/CL/ICLKernel.h
+    find_path(ARMCOMPUTE_INCLUDE arm_compute/core/CL/OpenCL.h
               PATHS ${ARMCOMPUTE_ROOT}/include
               PATHS ${ARMCOMPUTE_ROOT}/applications/arm_compute
               PATHS ${ARMCOMPUTE_ROOT}
               NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-    find_path(ARMCOMPUTE_INCLUDE arm_compute/core/CL/ICLKernel.h)
+    find_path(ARMCOMPUTE_INCLUDE arm_compute/core/CL/OpenCL.h)
     include_directories(SYSTEM "${ARMCOMPUTE_INCLUDE}")
 
     # Find the Arm Compute libraries if not already specified (the user may have already defined this in advance,