diff --git a/docs/installation/source_compile.md b/docs/installation/source_compile.md index 6c333875b55b3064aa4d8d233f0aa2c818cd7f7c..33890845029e5c0a7881d1b75a232122d90aaa5c 100644 --- a/docs/installation/source_compile.md +++ b/docs/installation/source_compile.md @@ -260,7 +260,7 @@ git checkout | --arm_abi |必选,选择编译的arm版本,其中`armv7hf`为ARMLinux编译时选用| `armv8`、`armv7`、`armv7hf`(仅`armlinux`支持) | | --arm_lang |arm_os=android时必选,选择编译器 | `gcc`、`clang`(`clang`当前暂不支持) | | --android_stl |arm_os=android时必选,选择静态链接STL或动态链接STL | `c++_static`、`c++_shared`| -| --build_java | 可选,是否编译java预测库(默认为OFF) | `ON`、`OFF` | +| --build_java | 可选,是否编译java预测库(默认为ON) | `ON`、`OFF` | | --build_extra | 可选,是否编译全量预测库(默认为OFF)。详情可参考[预测库说明](./library.html)。 | `ON`、`OFF` | | target |必选,选择编译模式,`tiny_publish`为编译移动端部署库、`full_publish`为带依赖的移动端部署库、`test`为移动端单元测试、`ios`为编译ios端`tiny_publish` | `tiny_publish`、`full_publish`、`test`、 `ios` | @@ -277,9 +277,7 @@ git checkout --arm_abi=armv8 \ --build_extra=OFF \ --arm_lang=gcc \ - --build_java=ON \ --android_stl=c++_static \ - --build_extra=OFF \ tiny_publish ``` ##### IOS @@ -304,11 +302,9 @@ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer ```shell ./lite/tools/build.sh \ --build_extra=OFF \ - --build_java=ON \ --arm_os=armlinux \ --arm_abi=armv7hf \ --arm_lang=gcc \ - --build_extra=OFF \ tiny_publish ``` - `--arm_abi`: 树莓派3b使用armv7hf,RK3399使用armv8 @@ -322,9 +318,7 @@ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer --arm_abi=armv8 \ --build_extra=OFF \ --arm_lang=gcc \ - --build_java=ON \ --android_stl=c++_static \ - --build_extra=OFF \ full_publish ``` ##### ARMLinux @@ -333,7 +327,6 @@ sudo xcode-select -s /Applications/Xcode.app/Contents/Developer --arm_os=armlinux \ --arm_abi=armv7hf \ --arm_lang=gcc \ - --build_java=ON \ --build_extra=OFF \ full_publish ``` diff --git a/lite/CMakeLists.txt b/lite/CMakeLists.txt index bac6f80c4721e0c5de201eebfe7e6a39a0bdc73a..36ef74c44d4f19c646e97aae81d950aed27c1e47 100644 --- a/lite/CMakeLists.txt +++ b/lite/CMakeLists.txt @@ -135,22 +135,23 @@ if (LITE_WITH_LIGHT_WEIGHT_FRAMEWORK AND LITE_WITH_ARM) COMMAND cp "${CMAKE_SOURCE_DIR}/lite/api/paddle_*.h" "${INFER_LITE_PUBLISH_ROOT}/cxx/include" COMMAND cp "${CMAKE_BINARY_DIR}/libpaddle_api_full_bundled.a" "${INFER_LITE_PUBLISH_ROOT}/cxx/lib" COMMAND cp "${CMAKE_BINARY_DIR}/libpaddle_api_light_bundled.a" "${INFER_LITE_PUBLISH_ROOT}/cxx/lib" - #COMMAND cp "${CMAKE_BINARY_DIR}/lite/api/model_optimize_tool" "${INFER_LITE_PUBLISH_ROOT}/bin" COMMAND cp "${CMAKE_BINARY_DIR}/lite/gen_code/paddle_code_generator" "${INFER_LITE_PUBLISH_ROOT}/bin" COMMAND cp "${CMAKE_BINARY_DIR}/lite/api/test_model_bin" "${INFER_LITE_PUBLISH_ROOT}/bin" COMMAND cp "${CMAKE_SOURCE_DIR}/lite/utils/cv/paddle_*.h" "${INFER_LITE_PUBLISH_ROOT}/cxx/include" ) if(NOT IOS) - #add_dependencies(publish_inference_cxx_lib model_optimize_tool) add_dependencies(publish_inference_cxx_lib paddle_code_generator) add_dependencies(publish_inference_cxx_lib bundle_full_api) add_dependencies(publish_inference_cxx_lib bundle_light_api) add_dependencies(publish_inference_cxx_lib test_model_bin) + add_dependencies(publish_inference_cxx_lib benchmark_bin) if (ARM_TARGET_OS STREQUAL "android" OR ARM_TARGET_OS STREQUAL "armlinux") add_dependencies(publish_inference_cxx_lib paddle_full_api_shared) add_dependencies(publish_inference paddle_light_api_shared) add_custom_command(TARGET publish_inference_cxx_lib - COMMAND cp ${CMAKE_BINARY_DIR}/lite/api/*.so ${INFER_LITE_PUBLISH_ROOT}/cxx/lib) + COMMAND cp ${CMAKE_BINARY_DIR}/lite/api/*.so ${INFER_LITE_PUBLISH_ROOT}/cxx/lib + COMMAND cp "${CMAKE_BINARY_DIR}/lite/api/benchmark_bin" "${INFER_LITE_PUBLISH_ROOT}/bin" + ) endif() add_dependencies(publish_inference publish_inference_cxx_lib) if(NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") diff --git a/lite/tools/build.sh b/lite/tools/build.sh index 7bb330b28bc51ca4a241831bd320cb25474a74cd..a90d67ebbc2724ac15147fc4de2989bf517ae218 100755 --- a/lite/tools/build.sh +++ b/lite/tools/build.sh @@ -14,7 +14,7 @@ readonly NUM_PROC=${LITE_BUILD_THREADS:-4} # global variables BUILD_EXTRA=OFF -BUILD_JAVA=OFF +BUILD_JAVA=ON BUILD_PYTHON=OFF BUILD_DIR=$(pwd) OPTMODEL_DIR=""