From f92b7bd86d485c05a040170b057d22a486385ba3 Mon Sep 17 00:00:00 2001 From: Hui Zhang Date: Tue, 7 Mar 2023 04:37:45 +0000 Subject: [PATCH] install vad lib/bin/inc --- runtime/CMakeLists.txt | 3 +++ runtime/build.sh | 3 ++- runtime/cmake/fastdeploy.cmake | 11 ++++++++--- runtime/cmake/summary.cmake | 5 +++++ runtime/engine/common/frontend/CMakeLists.txt | 2 +- runtime/engine/vad/interface/CMakeLists.txt | 8 ++++++-- 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index a8203a6d7..3f3504732 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -39,6 +39,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++14 -pthread -fPIC -O0 -Wall -g SET(CMAKE_CXX_FLAGS_DEBUG "$ENV{CXXFLAGS} --std=c++14 -pthread -fPIC -O0 -Wall -g -ggdb") SET(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} --std=c++14 -pthread -fPIC -O3 -Wall") +# install dir into `build/install` +set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/install) + ############################################################################### # Option Configurations ############################################################################### diff --git a/runtime/build.sh b/runtime/build.sh index 855c3b1aa..d7a4bbc7c 100755 --- a/runtime/build.sh +++ b/runtime/build.sh @@ -4,5 +4,6 @@ set -xe # the build script had verified in the paddlepaddle docker image. # please follow the instruction below to install PaddlePaddle image. # https://www.paddlepaddle.org.cn/documentation/docs/zh/install/docker/linux-docker.html -cmake -B build -DBUILD_SHARED_LIBS=OFF -DWITH_ASR=OFF -DWITH_CLS=OFF -DWITH_VAD=ON -DFASTDEPLOY_INSTALL_DIR=/workspace/zhanghui/paddle/FastDeploy/build/Android/arm64-v8a-api-21/install +#cmake -B build -DBUILD_SHARED_LIBS=OFF -DWITH_ASR=OFF -DWITH_CLS=OFF -DWITH_VAD=ON -DFASTDEPLOY_INSTALL_DIR=/workspace/zhanghui/paddle/FastDeploy/build/Android/arm64-v8a-api-21/install +cmake -B build -DBUILD_SHARED_LIBS=OFF -DWITH_ASR=OFF -DWITH_CLS=OFF -DWITH_VAD=ON -DFASTDEPLOY_INSTALL_DIR=/workspace/zhanghui/paddle/FastDeploy/build/Linux/x86_64/install cmake --build build -j diff --git a/runtime/cmake/fastdeploy.cmake b/runtime/cmake/fastdeploy.cmake index e5e7f1f99..25a0e313d 100644 --- a/runtime/cmake/fastdeploy.cmake +++ b/runtime/cmake/fastdeploy.cmake @@ -23,22 +23,27 @@ if(ANDROID) if(NOT DEFINED FASTDEPLOY_INSTALL_DIR) set(FASTDEPLOY_INSTALL_DIR ${FASTDEPLOY_DIR}/android-armv7v8) endif() + add_definitions("-DUSE_PADDLE_LITE_BAKEND") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -mfloat-abi=softfp -mfpu=vfpv3 -mfpu=neon -fPIC -pie -fPIE") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -g0 -O3 -mfloat-abi=softfp -mfpu=vfpv3 -mfpu=neon -fPIC -pie -fPIE") elseif(UNIX) - set(FASTDEPLOY_INSTALL_DIR ${FASTDEPLOY_DIR}/linux-x64) + if(NOT DEFINED FASTDEPLOY_INSTALL_DIR) + set(FASTDEPLOY_INSTALL_DIR ${FASTDEPLOY_DIR}/linux-x64) + endif() + add_definitions("-DUSE_PADDLE_INFERENCE_BACKEND") # add_definitions("-DUSE_ORT_BACKEND") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -msse -msse2") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -msse -msse2 -mavx -O3") endif() -message(STATUS "FASTDEPLOY_INSTALL_DIR=${FASTDEPLOY_INSTALL_DIR} ${UNIX}") include(${FASTDEPLOY_INSTALL_DIR}/FastDeploy.cmake) # fix compiler flags conflict, since fastdeploy using c++11 for project set(CMAKE_CXX_STANDARD ${PPS_CXX_STANDARD}) include_directories(${FASTDEPLOY_INCS}) -message(STATUS "FASTDEPLOY_INCS=${FASTDEPLOY_INCS}") \ No newline at end of file + +# install fastdeploy and dependents lib +install_fastdeploy_libraries(${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) \ No newline at end of file diff --git a/runtime/cmake/summary.cmake b/runtime/cmake/summary.cmake index fd47c6bd4..1d0ae6ec7 100644 --- a/runtime/cmake/summary.cmake +++ b/runtime/cmake/summary.cmake @@ -24,10 +24,13 @@ function(pps_summary) message(STATUS " C++ compiler version : ${CMAKE_CXX_COMPILER_VERSION}") message(STATUS " CXX flags : ${CMAKE_CXX_FLAGS}") message(STATUS " Build type : ${CMAKE_BUILD_TYPE}") + message(STATUS " BUILD_SHARED_LIBS : ${BUILD_SHARED_LIBS}") get_directory_property(tmp DIRECTORY ${PROJECT_SOURCE_DIR} COMPILE_DEFINITIONS) message(STATUS " Compile definitions : ${tmp}") message(STATUS " CMAKE_PREFIX_PATH : ${CMAKE_PREFIX_PATH}") + message(STATUS " CMAKE_CURRENT_BINARY_DIR : ${CMAKE_CURRENT_BINARY_DIR}") message(STATUS " CMAKE_INSTALL_PREFIX : ${CMAKE_INSTALL_PREFIX}") + message(STATUS " CMAKE_INSTALL_LIBDIR : ${CMAKE_INSTALL_LIBDIR}") message(STATUS " CMAKE_MODULE_PATH : ${CMAKE_MODULE_PATH}") message(STATUS " CMAKE_SYSTEM_NAME : ${CMAKE_SYSTEM_NAME}") message(STATUS "") @@ -39,6 +42,8 @@ function(pps_summary) message(STATUS " WITH_TESTING : ${WITH_TESTING}") message(STATUS " WITH_PROFILING : ${WITH_PROFILING}") message(STATUS " FASTDEPLOY_INSTALL_DIR : ${FASTDEPLOY_INSTALL_DIR}") + message(STATUS " FASTDEPLOY_INCS : ${FASTDEPLOY_INCS}") + message(STATUS " FASTDEPLOY_LIBS : ${FASTDEPLOY_LIBS}") if(WITH_GPU) message(STATUS " CUDA_DIRECTORY : ${CUDA_DIRECTORY}") endif() diff --git a/runtime/engine/common/frontend/CMakeLists.txt b/runtime/engine/common/frontend/CMakeLists.txt index 4ff3117c9..983e89e89 100644 --- a/runtime/engine/common/frontend/CMakeLists.txt +++ b/runtime/engine/common/frontend/CMakeLists.txt @@ -15,7 +15,7 @@ add_library(frontend STATIC assembler.cc wave-reader.cc ) -target_link_libraries(frontend PUBLIC kaldi-native-fbank-core utils) +target_link_libraries(frontend PUBLIC kaldi-native-fbank-core utils base) set(BINS compute_fbank_main diff --git a/runtime/engine/vad/interface/CMakeLists.txt b/runtime/engine/vad/interface/CMakeLists.txt index 087e38ce4..c8fdf8a8d 100644 --- a/runtime/engine/vad/interface/CMakeLists.txt +++ b/runtime/engine/vad/interface/CMakeLists.txt @@ -3,9 +3,13 @@ set(srcs ) add_library(vad_interface ${srcs}) -target_link_libraries(vad_interface INTERFACE ${FASTDEPLOY_LIBS} vad) +target_link_libraries(vad_interface INTERFACE ${FASTDEPLOY_LIBS} vad extern_glog) set(bin_name vad_interface_main) add_executable(${bin_name} ${CMAKE_CURRENT_SOURCE_DIR}/${bin_name}.cc) -target_link_libraries(${bin_name} ${FASTDEPLOY_LIBS} vad_interface) \ No newline at end of file +target_link_libraries(${bin_name} ${FASTDEPLOY_LIBS} vad_interface) + +install(TARGETS vad_interface DESTINATION lib) +install(FILES vad_interface.h DESTINATION include) +install(TARGETS vad_interface_main DESTINATION bin) \ No newline at end of file