[OpenCL][Compile] Remove online download opencl headers (PaddlePaddle…

…#6516)

.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

@@ -213,8 +213,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

lite/backends/opencl/CMakeLists.txt

@@ -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)

lite/backends/opencl/cl_include.h

@@ -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/tools/build.sh

@@ -246,7 +246,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
 }
 
@@ -507,9 +506,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/tools/build_android.sh

@@ -230,10 +230,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
 }
@@ -301,11 +298,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_linux.sh

@@ -271,10 +271,6 @@ function make_publish_so {
         ${CMAKE_COMMON_OPTIONS} \
         ${cmake_mutable_options}
 
-    if [ "${WITH_OPENCL}" = "ON" ]; then
-        make opencl_clhpp -j$NUM_PROC 
-    fi
-
     make publish_inference -j$NUM_PROC
     cd - > /dev/null
 }

lite/tools/build_macos.sh

@@ -208,9 +208,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/tools/build_windows.bat

@@ -180,15 +180,9 @@ if "%BUILD_FOR_CI%"=="ON" (
     msbuild /m:%cores% /p:Configuration=Release lite\api\opt.vcxproj
 ) else if "%BUILD_PLATFORM%"=="x64" (
     call "%vcvarsall_dir%" amd64
-    if "%WITH_OPENCL%"=="ON" (
-        msbuild /maxcpucount:%cores% /p:Configuration=Release lite\opencl_clhpp.vcxproj
-    )
     msbuild /maxcpucount:%cores% /p:Configuration=Release lite\publish_inference.vcxproj
 ) else (
     call "%vcvarsall_dir%" x86
-    if "%WITH_OPENCL%"=="ON" (
-        msbuild /maxcpucount:%cores% /p:Configuration=Release lite\opencl_clhpp.vcxproj
-    )
     msbuild /maxcpucount:%cores% /p:Configuration=Release lite\publish_inference.vcxproj
 )
 goto:eof
@@ -277,7 +271,7 @@ goto:eof
 goto:eof
 
 :set_vcvarsall_dir
-SET /P vcvarsall_dir="Please input the path of visual studio command Prompt, such as C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat   =======>"
+SET /P vcvarsall_dir="Please input the path of visual studio command Prompt, such as %vcvarsall_dir%   =======>"
 set tmp_var=!vcvarsall_dir!
 call:remove_space
 set vcvarsall_dir=!tmp_var!

lite/tools/ci_build.sh

@@ -207,7 +207,6 @@ function build_opencl {
     prepare_opencl_source_code $cur_dir $build_dir
 
     cmake_opencl ${os} ${abi} ${lang}
-    make opencl_clhpp -j$NUM_CORES_FOR_COMPILE
     build $TESTS_FILE
 }