diff --git a/paddle/fluid/lite/api/CMakeLists.txt b/paddle/fluid/lite/api/CMakeLists.txt index b62cebb97d5dd8190676360935e8b0b8eb3c2f61..bfb238d4d76aec6403969dfc597816917a5802a7 100644 --- a/paddle/fluid/lite/api/CMakeLists.txt +++ b/paddle/fluid/lite/api/CMakeLists.txt @@ -30,8 +30,7 @@ lite_cc_library(cxx_api_lite DEPS ${cxx_api_lite_deps} ${ops_lite} ${host_kernels} program_lite X86_DEPS ${x86_kernels} operator ARM_DEPS ${arm_kernels} - CL_DEPS ${opencl_kenrels} - ) + CL_DEPS ${opencl_kenrels}) lite_cc_library(light_api_lite SRCS light_api.cc DEPS scope_lite target_wrapper_host model_parser_lite @@ -39,8 +38,7 @@ lite_cc_library(light_api_lite SRCS light_api.cc CUDA_DEPS target_wrapper_cuda X86_DEPS ${x86_kernels} operator ARM_DEPS ${arm_kernels} - CL_DEPS ${opencl_kenrels} - ) + CL_DEPS ${opencl_kenrels}) include(ExternalProject) set(LITE_DEMO_INSTALL_DIR "${THIRD_PARTY_PATH}/inference_demo" CACHE STRING @@ -113,7 +111,7 @@ lite_cc_library(paddle_api_lite SRCS paddle_api.cc DEPS op_params_lite) lite_cc_library(paddle_api_full SRCS cxx_api_impl.cc DEPS cxx_api_lite paddle_api_lite light_api_lite ${ops_lite} ARM_DEPS ${arm_kernels} - ) + CL_DEPS ${opencl_kernels}) # The final inference library for just MobileConfig. lite_cc_library(paddle_api_light SRCS light_api_impl.cc DEPS light_api_lite paddle_api_lite) @@ -125,13 +123,14 @@ bundle_static_library(paddle_api_light paddle_api_light_bundled bundle_light_api lite_cc_test(test_paddle_api_lite SRCS paddle_api_test.cc DEPS paddle_api_full paddle_api_light ${ops_lite} ARM_DEPS ${arm_kernels} - X86_DEPS ${x86_kernels} CL_DEPS ${opencl_kernels} + X86_DEPS ${x86_kernels} ARGS --model_dir=${LITE_MODEL_DIR}/lite_naive_model SERIAL) lite_cc_test(test_model_bin SRCS model_test.cc DEPS paddle_api_full paddle_api_light ${ops_lite} ARM_DEPS ${arm_kernels} + CL_DEPS ${opencl_kernels} X86_DEPS ${x86_kernels}) if (WITH_TESTING) @@ -154,8 +153,8 @@ lite_cc_binary(cxx_api_lite_bin SRCS cxx_api_bin_int8.cc target_wrapper_host mir_passes ${ops_lite} ${host_kernels} - CL_DEPS ${opencl_kernels} - ARM_DEPS ${arm_kernels}) + ARM_DEPS ${arm_kernels} + CL_DEPS ${opencl_kernels}) lite_cc_binary(model_optimize_tool SRCS model_optimize_tool.cc DEPS paddle_api_full CL_DEPS ${opencl_kernels}) diff --git a/paddle/fluid/lite/model_parser/CMakeLists.txt b/paddle/fluid/lite/model_parser/CMakeLists.txt index a681f889bf6cb02d83fe53a67319521b3b45fbbd..85f69ec9b74df0872fb870fab8c5ef0f0ebf6bd3 100644 --- a/paddle/fluid/lite/model_parser/CMakeLists.txt +++ b/paddle/fluid/lite/model_parser/CMakeLists.txt @@ -22,6 +22,5 @@ lite_cc_library(model_parser_lite SRCS model_parser.cc DEPS lite_cc_test(test_op_desc_lite SRCS op_desc_test.cc DEPS cpp_op_desc_lite op_desc_lite compatible_pb_lite) - add_subdirectory(pb) add_subdirectory(cpp) diff --git a/paddle/fluid/lite/tools/build.sh b/paddle/fluid/lite/tools/build.sh index 84ed53b29b15c53ef2eaa36197216cc09f9b0b9c..73919cc3d61fb1a0d5c2d5f7ca9a8b6dbdfeb006 100755 --- a/paddle/fluid/lite/tools/build.sh +++ b/paddle/fluid/lite/tools/build.sh @@ -537,10 +537,6 @@ function main { cmake_x86 shift ;; - cmake_opencl) - cmake_opencl $ARM_OS $ARM_ABI - shift - ;; cmake_cuda) cmake_cuda shift