diff --git a/CMakeLists.txt b/CMakeLists.txt index 8db603a..7d8e196 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ string(ASCII 27 Esc) set(ColourReset "${Esc}[m") set(BoldGreen "${Esc}[1;32m") set(BoldRed "${Esc}[31m") -#运行参数 +# 运行参数 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -pthread -fPIC") set(LIB_BASE_DIR /root/projects/temp_xiaoke/asr_runtime/lib_files) option(GRPC "whether to build with gRPC" ON) @@ -17,6 +17,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux) if(ONNX) include(onnx) endif() + include(openfst) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} @@ -29,7 +30,7 @@ add_subdirectory(frontend) add_subdirectory(post_processor) add_subdirectory(kaldi) # kaldi: add_subdirectory(decoder) -#Connection Option +# Connection Option if(GRPC) include(grpc) add_subdirectory(grpc) diff --git a/cmake-linux/grpc.cmake b/cmake-linux/grpc.cmake index 6c09e32..9cbc22f 100644 --- a/cmake-linux/grpc.cmake +++ b/cmake-linux/grpc.cmake @@ -8,6 +8,13 @@ if(NOT EXISTS ${grpc_build_dir}) execute_process( COMMAND cmake -DgRPC_INSTALL=ON + -DCMAKE_BUILD_TYPE=Release + -DgRPC_PROTOBUF_PROVIDER=package + -DgRPC_CARES_PROVIDER=package + -DgRPC_ABSL_PROVIDER=package + -DgRPC_RE2_PROVIDER=package + -DgRPC_SSL_PROVIDER=package + -DgRPC_ZLIB_PROVIDER=package -DgRPC_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=${grpc_build_dir} -S ${LIB_BASE_DIR}/grpc-src @@ -20,13 +27,18 @@ if(NOT EXISTS ${grpc_build_dir}) COMMAND cmake --install . -j6 WORKING_DIRECTORY ${grpc_build_dir}) execute_process( - COMMAND cp -r ${LIB_BASE_DIR}/grpc-src/third_party/abseil-cpp/absl ${grpc_build_dir}/include) + COMMAND cp -rf ${LIB_BASE_DIR}/grpc-src/third_party/abseil-cpp/absl ${grpc_build_dir}/include) message("${BoldGreen}GRPC Installed !${ColourReset}") endif() -FetchContent_Declare(grpc - SOURCE_DIR ${LIB_BASE_DIR}/grpc-src) -FetchContent_MakeAvailable(grpc) +set(CMAKE_PREFIX_PATH ${grpc_build_dir} + ${grpc_build_dir}/grpc/ + ${grpc_build_dir}/grpc/cmake/ + ${CMAKE_PREFIX_PATH}) + +find_package(Threads REQUIRED) +find_package(Protobuf CONFIG REQUIRED) +find_package(gRPC CONFIG REQUIRED) include_directories(${grpc_build_dir}/include) # local proto file diff --git a/post_processor/post_processor.cc b/post_processor/post_processor.cc index 4f070f8..33d137d 100644 --- a/post_processor/post_processor.cc +++ b/post_processor/post_processor.cc @@ -16,7 +16,7 @@ #include "post_processor/post_processor.h" #include #include -#include "processor/wetext_processor.h" +//#include "processor/wetext_processor.h" #include "utils/string.h" namespace wenet { diff --git a/post_processor/post_processor.h b/post_processor/post_processor.h index b05aee6..07f8cdc 100644 --- a/post_processor/post_processor.h +++ b/post_processor/post_processor.h @@ -19,7 +19,6 @@ #include #include #include -#include "processor/wetext_processor.h" #include "utils/utils.h" namespace wenet {