From: Francis Murtagh Date: Wed, 4 Nov 2020 13:33:41 +0000 (+0000) Subject: COMPMID-3639: (3RDPARTY_UPDATE) Move CL kernels to src X-Git-Tag: submit/tizen/20210421.062230~228 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82490eee66b733ef29b3697b21e10a4c8be95233;p=platform%2Fupstream%2Farmnn.git COMPMID-3639: (3RDPARTY_UPDATE) Move CL kernels to src * Change file Armnn GlobalConfig.cmake uses to find ARMCOMPUTE_INCLUDE * Original file has been moved and no longer visible Signed-off-by: Francis Murtagh Change-Id: I91c1376124dad2b2db764f83c421a1cc110e5dd1 --- diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index 3fb12df..01ce91f 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -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,