From ad76721f1a22ce60e23985a40381e20162da6824 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 10 May 2024 16:32:31 +0800 Subject: [PATCH] =?UTF-8?q?2024.5.10-=E5=8E=BB=E9=99=A4ITN=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- post_processor/CMakeLists.txt | 9 +++++---- post_processor/{wetext => }/processor/CMakeLists.txt | 0 .../{wetext/bin => processor}/processor_main.cc | 2 +- .../{wetext => }/processor/wetext_processor.cc | 0 post_processor/{wetext => }/processor/wetext_processor.h | 0 .../{wetext => }/processor/wetext_token_parser.cc | 0 .../{wetext => }/processor/wetext_token_parser.h | 0 post_processor/{wetext => }/utils/CMakeLists.txt | 0 post_processor/{wetext => }/utils/wetext_flags.h | 2 +- post_processor/{wetext => }/utils/wetext_log.h | 2 +- post_processor/{wetext => }/utils/wetext_string.cc | 0 post_processor/{wetext => }/utils/wetext_string.h | 0 post_processor/wetext/bin/CMakeLists.txt | 2 -- 13 files changed, 8 insertions(+), 9 deletions(-) rename post_processor/{wetext => }/processor/CMakeLists.txt (100%) rename post_processor/{wetext/bin => processor}/processor_main.cc (97%) rename post_processor/{wetext => }/processor/wetext_processor.cc (100%) rename post_processor/{wetext => }/processor/wetext_processor.h (100%) rename post_processor/{wetext => }/processor/wetext_token_parser.cc (100%) rename post_processor/{wetext => }/processor/wetext_token_parser.h (100%) rename post_processor/{wetext => }/utils/CMakeLists.txt (100%) rename post_processor/{wetext => }/utils/wetext_flags.h (96%) rename post_processor/{wetext => }/utils/wetext_log.h (96%) rename post_processor/{wetext => }/utils/wetext_string.cc (100%) rename post_processor/{wetext => }/utils/wetext_string.h (100%) delete mode 100644 post_processor/wetext/bin/CMakeLists.txt diff --git a/post_processor/CMakeLists.txt b/post_processor/CMakeLists.txt index 0328d49..54e9c12 100644 --- a/post_processor/CMakeLists.txt +++ b/post_processor/CMakeLists.txt @@ -1,14 +1,15 @@ message(STATUS "post_processor dir:${CMAKE_CURRENT_SOURCE_DIR}") -add_library(wetext_utils STATIC ${CMAKE_CURRENT_SOURCE_DIR}/utils/wetext_string.cc) +add_library(wetext_utils STATIC utils/wetext_string.cc) target_link_libraries(wetext_utils PUBLIC glog) add_library(wetext_processor STATIC - ${CMAKE_CURRENT_SOURCE_DIR}/processor/wetext_processor.cc - ${CMAKE_CURRENT_SOURCE_DIR}/processor/wetext_token_parser.cc + processor/wetext_processor.cc + processor/wetext_token_parser.cc ) target_link_libraries(wetext_processor PUBLIC dl fst wetext_utils) -add_executable(processor_main processor_main.cc) +add_executable(processor_main processor/processor_main.cc) + target_link_libraries(processor_main PUBLIC wetext_processor) add_library(post_processor STATIC diff --git a/post_processor/wetext/processor/CMakeLists.txt b/post_processor/processor/CMakeLists.txt similarity index 100% rename from post_processor/wetext/processor/CMakeLists.txt rename to post_processor/processor/CMakeLists.txt diff --git a/post_processor/wetext/bin/processor_main.cc b/post_processor/processor/processor_main.cc similarity index 97% rename from post_processor/wetext/bin/processor_main.cc rename to post_processor/processor/processor_main.cc index 24add7f..c54d443 100644 --- a/post_processor/wetext/bin/processor_main.cc +++ b/post_processor/processor/processor_main.cc @@ -16,7 +16,7 @@ #include #include -#include "../processor/wetext_processor.h" +#include "wetext_processor.h" #include "../utils/wetext_flags.h" DEFINE_string(text, "", "input string"); diff --git a/post_processor/wetext/processor/wetext_processor.cc b/post_processor/processor/wetext_processor.cc similarity index 100% rename from post_processor/wetext/processor/wetext_processor.cc rename to post_processor/processor/wetext_processor.cc diff --git a/post_processor/wetext/processor/wetext_processor.h b/post_processor/processor/wetext_processor.h similarity index 100% rename from post_processor/wetext/processor/wetext_processor.h rename to post_processor/processor/wetext_processor.h diff --git a/post_processor/wetext/processor/wetext_token_parser.cc b/post_processor/processor/wetext_token_parser.cc similarity index 100% rename from post_processor/wetext/processor/wetext_token_parser.cc rename to post_processor/processor/wetext_token_parser.cc diff --git a/post_processor/wetext/processor/wetext_token_parser.h b/post_processor/processor/wetext_token_parser.h similarity index 100% rename from post_processor/wetext/processor/wetext_token_parser.h rename to post_processor/processor/wetext_token_parser.h diff --git a/post_processor/wetext/utils/CMakeLists.txt b/post_processor/utils/CMakeLists.txt similarity index 100% rename from post_processor/wetext/utils/CMakeLists.txt rename to post_processor/utils/CMakeLists.txt diff --git a/post_processor/wetext/utils/wetext_flags.h b/post_processor/utils/wetext_flags.h similarity index 96% rename from post_processor/wetext/utils/wetext_flags.h rename to post_processor/utils/wetext_flags.h index 0bea9c7..46189c8 100644 --- a/post_processor/wetext/utils/wetext_flags.h +++ b/post_processor/utils/wetext_flags.h @@ -18,6 +18,6 @@ // Because openfst is a dynamic library compiled with gflags/glog, we must use // the gflags/glog from openfst to avoid them linked both statically and // dynamically into the executable. -#include "../../../utils/flags.h" +#include "../../utils/flags.h" #endif // UTILS_WETEXT_FLAGS_H_ diff --git a/post_processor/wetext/utils/wetext_log.h b/post_processor/utils/wetext_log.h similarity index 96% rename from post_processor/wetext/utils/wetext_log.h rename to post_processor/utils/wetext_log.h index be5b804..67c574d 100644 --- a/post_processor/wetext/utils/wetext_log.h +++ b/post_processor/utils/wetext_log.h @@ -18,6 +18,6 @@ // Because openfst is a dynamic library compiled with gflags/glog, we must use // the gflags/glog from openfst to avoid them linked both statically and // dynamically into the executable. -#include "../../../utils/log.h" +#include "../../utils/log.h" #endif // UTILS_WETEXT_LOG_H_ diff --git a/post_processor/wetext/utils/wetext_string.cc b/post_processor/utils/wetext_string.cc similarity index 100% rename from post_processor/wetext/utils/wetext_string.cc rename to post_processor/utils/wetext_string.cc diff --git a/post_processor/wetext/utils/wetext_string.h b/post_processor/utils/wetext_string.h similarity index 100% rename from post_processor/wetext/utils/wetext_string.h rename to post_processor/utils/wetext_string.h diff --git a/post_processor/wetext/bin/CMakeLists.txt b/post_processor/wetext/bin/CMakeLists.txt deleted file mode 100644 index b06482e..0000000 --- a/post_processor/wetext/bin/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -add_executable(processor_main processor_main.cc) -target_link_libraries(processor_main PUBLIC wetext_processor)