[OpenCL][Compile] Remove online download opencl headers (#6533)

* [OpenCL][Compile] Remove online download opencl headers (#6516)

* test=develop

Author: zhaoyang-star

.pre-commit-config.yaml

@@ -19,6 +19,7 @@ repos:
     -   id: detect-private-key
         files: (?!.*third_party)^.*$|(?!.*book)^.*$
     -   id: end-of-file-fixer
+        exclude: ^(third-party/)
 -   repo: local
     hooks:
     -   id: clang-format-with-version-check

CMakeLists.txt

@@ -205,8 +205,7 @@ endif()
 
 # for opencl
 if (LITE_WITH_OPENCL)
-    include(external/opencl-headers)
-    include(external/opencl-clhpp)
+    include_directories("${PADDLE_SOURCE_DIR}/third-party/opencl/include")
 endif()
 
 # for mobile

cmake/external/opencl-clhpp.cmake

@@ -15,5 +15,3 @@ lite_cc_library(cl_image SRCS cl_image.cc DEPS tensor cl_image_converter cl_runt
 lite_cc_library(cl_caller SRCS cl_caller.cc  DEPS cl_context cl_image)
 lite_cc_library(cl_target_wrapper SRCS target_wrapper.cc DEPS cl_runtime)
 lite_cc_test(test_cl_functions SRCS cl_functions_test.cc DEPS cl_context cl_image cl_caller cl_wrapper cl_target_wrapper)
-
-add_dependencies(cl_wrapper opencl_clhpp)

cmake/external/opencl-headers.cmake

@@ -18,4 +18,4 @@
 #define CL_HPP_TARGET_OPENCL_VERSION 110
 #define CL_HPP_MINIMUM_OPENCL_VERSION 110
 
-#include <CL/cl2.hpp>
+#include "CL/cl2.hpp"

lite/backends/opencl/CMakeLists.txt

@@ -242,7 +242,6 @@ function make_opencl {
       -DLITE_WITH_CV=$BUILD_CV \
       -DARM_TARGET_OS=$1 -DARM_TARGET_ARCH_ABI=$2 -DARM_TARGET_LANG=$3
 
-    make opencl_clhpp -j$NUM_PROC
     make publish_inference -j$NUM_PROC
 }
 
@@ -495,9 +494,6 @@ function make_x86 {
             -DPY_VERSION=$PY_VERSION \
             $PYTHON_EXECUTABLE_OPTION
 
-  if [ ${WITH_OPENCL} == "ON" ]; then
-    make opencl_clhpp -j$NUM_PROC
-  fi
   make publish_inference -j$NUM_PROC
   cd -
 }

lite/backends/opencl/cl_include.h

@@ -219,10 +219,7 @@ function make_tiny_publish_so {
       ${cmake_mutable_options}  \
       -DLITE_ON_TINY_PUBLISH=ON
 
-  # Step4. Compile libs: cxx_lib, java_lib, opencl_lib
-  if [ "${WITH_OPENCL}" == "ON" ]; then
-      make opencl_clhpp -j$NUM_PROC
-  fi
+  # Step4. Compile libs: cxx_lib, java_lib
   make publish_inference -j$NUM_PROC
   cd - > /dev/null
 }
@@ -285,11 +282,6 @@ function make_full_publish_so {
       ${cmake_api_level_options} \
       ${cmake_mutable_options}
 
-  # todo: third_party of opencl should be moved into git submodule and cmake later
-  if [ "${WITH_OPENCL}" == "ON" ]; then
-      make opencl_clhpp -j$NUM_PROC
-  fi
-
   make publish_inference -j$NUM_PROC
   cd - > /dev/null
 }

lite/tools/build.sh

@@ -19,7 +19,7 @@ WITH_STATIC_LIB=OFF
 WITH_CV=OFF
 # controls whether to print log information, default is ON.
 WITH_LOG=ON
-# controls whether to throw the exception when error occurs, default is OFF 
+# controls whether to throw the exception when error occurs, default is OFF
 WITH_EXCEPTION=OFF
 # options of striping lib according to input model.
 WITH_STRIP=OFF
@@ -31,13 +31,13 @@ WITH_ROCKCHIP_NPU=OFF
 ROCKCHIP_NPU_SDK_ROOT="$(pwd)/rknpu_ddk"  # Download RKNPU SDK from https://github.com/airockchip/rknpu_ddk.git
 # options of compiling imagination NNA lib
 WITH_IMAGINATION_NNA=OFF
-IMAGINATION_NNA_SDK_ROOT="$(pwd)/imagination_nna_sdk" 
+IMAGINATION_NNA_SDK_ROOT="$(pwd)/imagination_nna_sdk"
 # options of compiling baidu XPU lib.
 WITH_BAIDU_XPU=OFF
 BAIDU_XPU_SDK_ROOT=""
 # options of compiling intel fpga.
 WITH_INTEL_FPGA=OFF
-INTEL_FPGA_SDK_ROOT="$(pwd)/intel_fpga_sdk" 
+INTEL_FPGA_SDK_ROOT="$(pwd)/intel_fpga_sdk"
 # options of adding training ops
 WITH_TRAIN=OFF
 # num of threads used during compiling..
@@ -125,7 +125,7 @@ function prepare_opencl_source_code {
     OPENCL_KERNELS_PATH=$root_dir/lite/backends/opencl/cl_kernel
     mkdir -p ${GEN_CODE_PATH_OPENCL}
     touch $GEN_CODE_PATH_OPENCL/opencl_kernels_source.cc
-    python $root_dir/lite/tools/cmake_tools/gen_opencl_code.py $OPENCL_KERNELS_PATH $GEN_CODE_PATH_OPENCL/opencl_kernels_source.cc 
+    python $root_dir/lite/tools/cmake_tools/gen_opencl_code.py $OPENCL_KERNELS_PATH $GEN_CODE_PATH_OPENCL/opencl_kernels_source.cc
 }
 
 # 3.3 prepare third_party libraries for compiling
@@ -201,10 +201,6 @@ function make_tiny_publish_so {
        ${cmake_mutable_options} \
        -DLITE_ON_TINY_PUBLISH=$is_tiny
 
-    if [ "${WITH_OPENCL}" = "ON" ]; then
-       make opencl_clhpp -j$NUM_PROC 
-    fi
-
     make publish_inference -j$NUM_PROC
     cd - > /dev/null
 }

lite/tools/build_android.sh

@@ -216,9 +216,6 @@ function make_x86 {
             -DPY_VERSION=$PY_VERSION \
             $PYTHON_EXECUTABLE_OPTION
 
-  if [ ${WITH_OPENCL} == "ON" ]; then
-    make opencl_clhpp -j$NUM_PROC
-  fi
   make publish_inference -j$NUM_PROC
   cd -
 }