From f1629e6ef4ab18717da4dcb9f2f2532add7fae64 Mon Sep 17 00:00:00 2001 From: Administrator Date: Sat, 18 May 2024 17:05:21 +0800 Subject: [PATCH] =?UTF-8?q?2024.5.16=20=E6=B5=8B=E8=AF=95=E6=95=B4?= =?UTF-8?q?=E4=BD=93=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 64 ++++++++++++++++++++++-------------------- CMakeLists.txt.bak | 50 +++++++++++++++++++++++++++++++++ CMakeLists.txt.test | 49 -------------------------------- bin/CMakeLists.txt | 4 +-- bin_test_env/gflags.cc | 2 +- 5 files changed, 86 insertions(+), 83 deletions(-) create mode 100644 CMakeLists.txt.bak delete mode 100644 CMakeLists.txt.test diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e1e4e2..90249d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,50 +1,52 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR) -project(wenet VERSION 0.2) +project(wenet VERSION 0.1) +# 测试模块参数设置 +option(GRPC "build with gRPC" OFF) +option(GFLAGS "build with GLOGS" ON) +option(GLOGS "build with GLOGS" OFF) +option(ONNX "build with ONNX" OFF) +option(OPENFST "build with FST" OFF) +option(CLEAN_CMAKE_CACHE "更换Build目录运行需要清空缓存" OFF) + + # set color 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 -w") -set(LIB_BASE_DIR /root/CXX_ENVS/wenet_runtime) -set(third_party_libraries) -option(GRPC "whether to build with gRPC" ON) -option(ONNX "whether to build with ONNX" ON) -option(CLEAN_CMAKE_CACHE "是否清空cmake缓存重新构建" ON) -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux) +set(third_party_libraries) +set(LIB_BASE_DIR /root/projects/temp_xiaoke/asr_runtime/lib_files) #清空缓存 if(CLEAN_CMAKE_CACHE) message(STATUS "Cleaning CMakeCache.txt") execute_process( - COMMAND find . -name "CMakeCache*" -exec rm -rf {} \; + COMMAND find . -name "CMake*" -exec rm -rf {} \; WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) endif () -# Model Option +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux) +if(GFLAGS) + include(gflags) + add_executable(gflags_main "gflags.cc") +elseif(GLOGS) + include(gflags) + include(glog) + add_executable(glog_main "glogs.cc") + target_link_libraries(glog_main ${third_party_libraries}) +elseif (GRPC) + include(grpc) + add_subdirectory(bin_test_grpc) +endif() + if(ONNX) include(onnx) + add_executable(onnx_main "onnx.cc") + target_link_libraries(onnx_main PRIVATE ${third_party_libraries}) endif() - -include(openfst) -#wenet个人项目内容 -include_directories( - ${OPENFST_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/kaldi -) -# Build all libraries -add_subdirectory(utils) -add_subdirectory(frontend) -add_subdirectory(post_processor) -add_subdirectory(kaldi) # kaldi: -add_subdirectory(decoder) -# Connection Option -if(GRPC) - add_subdirectory(grpc) +if(OPENFST) + include(openfst) + add_executable(fst_main "fst.cc") + target_link_libraries(fst_main PRIVATE ${third_party_libraries}) endif() - -# Build all bins -add_subdirectory(bin) \ No newline at end of file diff --git a/CMakeLists.txt.bak b/CMakeLists.txt.bak new file mode 100644 index 0000000..8e1e4e2 --- /dev/null +++ b/CMakeLists.txt.bak @@ -0,0 +1,50 @@ +cmake_minimum_required(VERSION 3.14 FATAL_ERROR) + +project(wenet VERSION 0.2) +# set color +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 -w") +set(LIB_BASE_DIR /root/CXX_ENVS/wenet_runtime) +set(third_party_libraries) +option(GRPC "whether to build with gRPC" ON) +option(ONNX "whether to build with ONNX" ON) +option(CLEAN_CMAKE_CACHE "是否清空cmake缓存重新构建" ON) + +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux) +#清空缓存 +if(CLEAN_CMAKE_CACHE) + message(STATUS "Cleaning CMakeCache.txt") + execute_process( + COMMAND find . -name "CMakeCache*" -exec rm -rf {} \; + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) +endif () +# Model Option +if(ONNX) + include(onnx) +endif() + +include(openfst) +#wenet个人项目内容 +include_directories( + ${OPENFST_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/kaldi +) +# Build all libraries +add_subdirectory(utils) +add_subdirectory(frontend) +add_subdirectory(post_processor) +add_subdirectory(kaldi) # kaldi: +add_subdirectory(decoder) +# Connection Option +if(GRPC) + add_subdirectory(grpc) +endif() + +# Build all bins +add_subdirectory(bin) \ No newline at end of file diff --git a/CMakeLists.txt.test b/CMakeLists.txt.test deleted file mode 100644 index dc0994e..0000000 --- a/CMakeLists.txt.test +++ /dev/null @@ -1,49 +0,0 @@ -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) - -project(wenet VERSION 0.1) -# 测试模块参数设置 -option(GRPC "build with gRPC" OFF) -option(GLOGS "build with GLOGS" OFF) -option(ONNX "build with ONNX" OFF) -option(OPENFST "build with FST" ON) -option(CLEAN_CMAKE_CACHE "更换Build目录运行需要清空缓存" OFF) - - -# set color -string(ASCII 27 Esc) -set(ColourReset "${Esc}[m") -set(BoldGreen "${Esc}[1;32m") -set(BoldRed "${Esc}[31m") - -set(third_party_libraries) -set(LIB_BASE_DIR /root/projects/temp_xiaoke/asr_runtime/lib_files) -#清空缓存 -if(CLEAN_CMAKE_CACHE) - message(STATUS "Cleaning CMakeCache.txt") - execute_process( - COMMAND find . -name "CMake*" -exec rm -rf {} \; - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) -endif () -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-linux) -if(GLOGS) - include(gflags) - include(glog) - add_executable(glog_main "glogs.cc") - target_link_libraries(glog_main ${third_party_libraries}) -endif() -if(GRPC) - include(grpc) - add_subdirectory(bin_test_grpc) -endif() - -if(ONNX) - include(onnx) - add_executable(onnx_main "onnx.cc") - target_link_libraries(onnx_main PRIVATE ${third_party_libraries}) -endif() -if(OPENFST) - include(openfst) - add_executable(fst_main "fst.cc") - target_link_libraries(fst_main PRIVATE ${third_party_libraries}) -endif() diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt index 8790a2e..083fb55 100644 --- a/bin/CMakeLists.txt +++ b/bin/CMakeLists.txt @@ -1,13 +1,13 @@ include_directories(${GFLAGS_BUILD_DIR}/include) add_executable(decoder_main decoder_main.cc) -target_link_libraries(decoder_main PUBLIC decoder) +target_link_libraries(decoder_main PUBLIC decoder ${GFLAGS_LIBRARIES}) if(IPEX) target_link_libraries(decoder_main PUBLIC "${TORCH_IPEX_LIBRARIES}") endif() message(STATUS "GFLAGS_BUILD_DIR: ${GFLAGS_BUILD_DIR}") add_executable(label_checker_main label_checker_main.cc) -target_link_libraries(label_checker_main PUBLIC decoder) +target_link_libraries(label_checker_main PUBLIC decoder ${GFLAGS_LIBRARIES}) if(TORCH) add_executable(api_main api_main.cc) diff --git a/bin_test_env/gflags.cc b/bin_test_env/gflags.cc index a21e26c..f441bd9 100644 --- a/bin_test_env/gflags.cc +++ b/bin_test_env/gflags.cc @@ -1,6 +1,6 @@ #include #include -//#include + DEFINE_string(input, "", "Input file to process."); DEFINE_int32(num_threads, 1, "Number of threads to use."); int main(int argc, char* argv[]) {