feat(runtime): support wenet-text-processing cmake build being a sub-… (#111)

xingchensong · web-flow · commit bea53816e3fd · 2023-09-16T10:59:09.000+08:00
* feat(runtime): support wenet-text-processing cmake build being a sub-project

* feat(runtime): support wenet-text-processing cmake build being a sub-project
diff --git a/runtime/android/app/src/main/cpp/CMakeLists.txt b/runtime/android/app/src/main/cpp/CMakeLists.txt
@@ -18,5 +18,5 @@ include_directories(
 add_subdirectory(utils)
 add_subdirectory(processor)
 
-link_libraries(processor android)
+link_libraries(wetext_processor android)
 add_library(${TARGET} SHARED wetextprocessing.cc)
diff --git a/runtime/android/app/src/main/cpp/wetextprocessing.cc b/runtime/android/app/src/main/cpp/wetextprocessing.cc
@@ -13,9 +13,9 @@
 // limitations under the License.
 #include <jni.h>
 
-#include "processor/processor.h"
-#include "utils/flags.h"
-#include "utils/string.h"
+#include "processor/wetext_processor.h"
+#include "utils/wetext_flags.h"
+#include "utils/wetext_string.h"
 
 namespace wetextprocessing {
 
diff --git a/runtime/bin/CMakeLists.txt b/runtime/bin/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(processor_main processor_main.cc)
-target_link_libraries(processor_main PUBLIC processor)
+target_link_libraries(processor_main PUBLIC wetext_processor)
diff --git a/runtime/bin/processor_main.cc b/runtime/bin/processor_main.cc
@@ -16,8 +16,8 @@
 #include <iostream>
 #include <string>
 
-#include "processor/processor.h"
-#include "utils/flags.h"
+#include "processor/wetext_processor.h"
+#include "utils/wetext_flags.h"
 
 DEFINE_string(text, "", "input string");
 DEFINE_string(file, "", "input file");
diff --git a/runtime/processor/CMakeLists.txt b/runtime/processor/CMakeLists.txt
@@ -1,13 +1,13 @@
-add_library(processor STATIC
-  processor.cc
-  token_parser.cc
+add_library(wetext_processor STATIC
+  wetext_processor.cc
+  wetext_token_parser.cc
 )
 if(ANDROID)
-  target_link_libraries(processor PUBLIC fst utils)
+  target_link_libraries(wetext_processor PUBLIC fst wetext_utils)
 else()
   if(MSVC)
-    target_link_libraries(processor PUBLIC fst utils)
+    target_link_libraries(wetext_processor PUBLIC fst wetext_utils)
   else()
-    target_link_libraries(processor PUBLIC dl fst utils)
+    target_link_libraries(wetext_processor PUBLIC dl fst wetext_utils)
   endif()
-endif()
+endif()
diff --git a/runtime/processor/wetext_processor.cc b/runtime/processor/wetext_processor.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "processor/processor.h"
+#include "processor/wetext_processor.h"
 
 using fst::StringTokenType;
 
diff --git a/runtime/processor/wetext_processor.h b/runtime/processor/wetext_processor.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef PROCESSOR_PROCESSOR_H_
-#define PROCESSOR_PROCESSOR_H_
+#ifndef PROCESSOR_WETEXT_PROCESSOR_H_
+#define PROCESSOR_WETEXT_PROCESSOR_H_
 
 #include "fst/fstlib.h"
 
-#include "processor/token_parser.h"
+#include "processor/wetext_token_parser.h"
 
 using fst::StdArc;
 using fst::StdVectorFst;
@@ -45,4 +45,4 @@ class Processor {
 
 }  // namespace wetext
 
-#endif  // PROCESSOR_PROCESSOR_H_
+#endif  // PROCESSOR_WETEXT_PROCESSOR_H_
diff --git a/runtime/processor/wetext_token_parser.cc b/runtime/processor/wetext_token_parser.cc
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "processor/token_parser.h"
+#include "processor/wetext_token_parser.h"
 
-#include "utils/log.h"
-#include "utils/string.h"
+#include "utils/wetext_log.h"
+#include "utils/wetext_string.h"
 
 namespace wetext {
 const std::string EOS = "<EOS>";
@@ -48,7 +48,7 @@ TokenParser::TokenParser(ParseType type) {
 }
 
 void TokenParser::Load(const std::string& input) {
-  SplitUTF8StringToChars(input, &text_);
+  wetext::SplitUTF8StringToChars(input, &text_);
   CHECK_GT(text_.size(), 0);
   index_ = 0;
   ch_ = text_[0];
@@ -83,7 +83,7 @@ bool TokenParser::ParseChar(const std::string& exp) {
 bool TokenParser::ParseChars(const std::string& exp) {
   bool ok = false;
   std::vector<std::string> chars;
-  SplitUTF8StringToChars(exp, &chars);
+  wetext::SplitUTF8StringToChars(exp, &chars);
   for (const auto& x : chars) {
     ok |= ParseChar(x);
   }
diff --git a/runtime/processor/wetext_token_parser.h b/runtime/processor/wetext_token_parser.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef PROCESSOR_TOKEN_PARSER_H_
-#define PROCESSOR_TOKEN_PARSER_H_
+#ifndef PROCESSOR_WETEXT_TOKEN_PARSER_H_
+#define PROCESSOR_WETEXT_TOKEN_PARSER_H_
 
 #include <set>
 #include <string>
@@ -88,4 +88,4 @@ class TokenParser {
 
 }  // namespace wetext
 
-#endif  // PROCESSOR_TOKEN_PARSER_H_
+#endif  // PROCESSOR_WETEXT_TOKEN_PARSER_H_
diff --git a/runtime/test/CMakeLists.txt b/runtime/test/CMakeLists.txt
@@ -3,16 +3,16 @@ link_libraries(gtest_main gmock)
 include(GoogleTest)
 
 add_executable(string_test string_test.cc)
-target_link_libraries(string_test PUBLIC utils)
+target_link_libraries(string_test PUBLIC wetext_utils)
 gtest_discover_tests(string_test)
 
 if(NOT MSVC)
   # token_parser_test uses the macro to access the private members
   add_executable(token_parser_test token_parser_test.cc)
-  target_link_libraries(token_parser_test PUBLIC processor)
+  target_link_libraries(token_parser_test PUBLIC wetext_processor)
   gtest_discover_tests(token_parser_test)
 endif()
 
 add_executable(processor_test processor_test.cc)
-target_link_libraries(processor_test PUBLIC processor)
+target_link_libraries(processor_test PUBLIC wetext_processor)
 gtest_discover_tests(processor_test)
diff --git a/runtime/test/processor_test.cc b/runtime/test/processor_test.cc
@@ -17,8 +17,8 @@
 
 #include "gmock/gmock.h"
 
-#include "processor/processor.h"
-#include "utils/string.h"
+#include "processor/wetext_processor.h"
+#include "utils/wetext_string.h"
 
 std::vector<std::pair<std::string, std::string>> ParseTestCase(
     const std::string& file_path) {
diff --git a/runtime/test/string_test.cc b/runtime/test/string_test.cc
@@ -14,7 +14,7 @@
 
 #include "gmock/gmock.h"
 
-#include "utils/string.h"
+#include "utils/wetext_string.h"
 
 class StringTest : public testing::Test {};
 
diff --git a/runtime/test/token_parser_test.cc b/runtime/test/token_parser_test.cc
@@ -19,7 +19,7 @@
 
 #define private public
 
-#include "processor/token_parser.h"
+#include "processor/wetext_token_parser.h"
 
 class TokenParserTest : public testing::Test {
  protected:
diff --git a/runtime/utils/CMakeLists.txt b/runtime/utils/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_library(utils STATIC string.cc)
+add_library(wetext_utils STATIC wetext_string.cc)
 
-target_link_libraries(utils PUBLIC glog)
+target_link_libraries(wetext_utils PUBLIC glog)
diff --git a/runtime/utils/wetext_flags.h b/runtime/utils/wetext_flags.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS_FLAGS_H_
-#define UTILS_FLAGS_H_
+#ifndef UTILS_WETEXT_FLAGS_H_
+#define UTILS_WETEXT_FLAGS_H_
 
 // 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 "fst/flags.h"
 
-#endif  // UTILS_FLAGS_H_
+#endif  // UTILS_WETEXT_FLAGS_H_
diff --git a/runtime/utils/wetext_log.h b/runtime/utils/wetext_log.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS_LOG_H_
-#define UTILS_LOG_H_
+#ifndef UTILS_WETEXT_LOG_H_
+#define UTILS_WETEXT_LOG_H_
 
 // 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 "fst/log.h"
 
-#endif  // UTILS_LOG_H_
+#endif  // UTILS_WETEXT_LOG_H_
diff --git a/runtime/utils/wetext_string.cc b/runtime/utils/wetext_string.cc
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "utils/string.h"
+#include "utils/wetext_string.h"
 
-#include "utils/log.h"
+#include "utils/wetext_log.h"
 
 namespace wetext {
 const char* WHITESPACE = " \n\r\t\f\v";
diff --git a/runtime/utils/wetext_string.h b/runtime/utils/wetext_string.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef UTILS_UTF8_STRING_H_
-#define UTILS_UTF8_STRING_H_
+#ifndef UTILS_WETEXT_STRING_H_
+#define UTILS_WETEXT_STRING_H_
 
 #include <string>
 #include <vector>
@@ -39,4 +39,4 @@ void Split(const std::string& str, const std::string& delim,
 
 }  // namespace wetext
 
-#endif  // UTILS_UTF8_STRING_H_
+#endif  // UTILS_WETEXT_STRING_H_

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`add_executable(processor_main processor_main.cc)`
`2`		`-target_link_libraries(processor_main PUBLIC processor)`
	`2`	`+target_link_libraries(processor_main PUBLIC wetext_processor)`