✅ Update runtime deps & CXX standard (#331)

- update openfst to 1.8.5
- update gflags, glog & gtest
- update CXX from std14 to std17

Issue-ID: #329

Co-authored-by: Fei Hao <haof1@chinatelecom.cn>

Author: mallocnew

runtime/CMakeLists.txt

@@ -1,9 +1,10 @@
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
 project(wetextprocessing VERSION 0.1)
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_VERBOSE_MAKEFILE OFF)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 option(BUILD_TESTING "whether to build unit test" OFF)
 
 include(FetchContent)
@@ -12,10 +13,8 @@ get_filename_component(fc_base "fc_base-${CMAKE_CXX_COMPILER_ID}" REALPATH BASE_
 set(FETCHCONTENT_BASE_DIR ${fc_base})
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-if(NOT MSVC)
-  # Keep the same with openfst, -fPIC or -fpic
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -pthread -fPIC")
-else()
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+if(MSVC)
   # For windows, please use unicode(3 bytes per chinese char) instead of gbk(2 bytes per chinese char).
   # https://github.com/wenet-e2e/wenet/issues/882#issuecomment-1101246299
   set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)

runtime/bin/CMakeLists.txt

@@ -1,2 +1,3 @@
 add_executable(processor_main processor_main.cc)
 target_link_libraries(processor_main PUBLIC wetext_processor)
+target_link_libraries(processor_main PUBLIC gflags glog)

runtime/bin/processor_main.cc

@@ -19,6 +19,9 @@
 #include "processor/wetext_processor.h"
 #include "utils/wetext_flags.h"
 
+#include <gflags/gflags.h>
+#include <glog/logging.h>
+
 DEFINE_string(text, "", "input string");
 DEFINE_string(file, "", "input file");
 DEFINE_string(tagger, "", "tagger fst path");

runtime/cmake/gflags.cmake

@@ -1,8 +1,8 @@
 set(GFLAGS_NAMESPACE "gflags")
 
 FetchContent_Declare(gflags
-  URL      https://github.com/gflags/gflags/archive/v2.2.2.zip
-  URL_HASH MD5=ff856ff64757f1381f7da260f79ba79b
+  URL      https://github.com/gflags/gflags/archive/refs/tags/v2.3.0.tar.gz
+  URL_HASH SHA256=f619a51371f41c0ad6837b2a98af9d4643b3371015d873887f7e8d3237320b2f
 )
 FetchContent_MakeAvailable(gflags)
 include_directories(${gflags_BINARY_DIR}/include)

runtime/cmake/glog.cmake

@@ -1,6 +1,6 @@
 FetchContent_Declare(glog
-  URL      https://github.com/google/glog/archive/v0.4.0.zip
-  URL_HASH MD5=2899b069b8229d49cd65eda5271315ad
+  URL      https://github.com/google/glog/archive/refs/tags/v0.7.1.zip
+  URL_HASH SHA256=c17d85c03ad9630006ef32c7be7c65656aba2e7e2fbfc82226b7e680c771fc88
 )
 FetchContent_MakeAvailable(glog)
 include_directories(${glog_SOURCE_DIR}/src ${glog_BINARY_DIR})

runtime/cmake/gtest.cmake

@@ -1,6 +1,6 @@
 FetchContent_Declare(googletest
-  URL      https://github.com/google/googletest/archive/release-1.12.1.zip
-  URL_HASH MD5=2648d4138129812611cf6b6b4b497a3b
+  URL      https://github.com/google/googletest/archive/refs/tags/v1.17.0.zip
+  URL_HASH SHA256=40d4ec942217dcc84a9ebe2a68584ada7d4a33a8ee958755763278ea1c5e18ff
 )
 if(MSVC)
   set(gtest_force_shared_crt ON CACHE BOOL "Always use msvcrt.dll" FORCE)

runtime/cmake/openfst.cmake

@@ -27,13 +27,13 @@ if(NOT ANDROID)
   # To build openfst with gflags and glog, we comment out some vars of {flags, log}.h and flags.cc.
   set(openfst_SOURCE_DIR ${fc_base}/openfst-src CACHE PATH "OpenFST source directory")
     FetchContent_Declare(openfst
-    URL           https://github.com/kkm000/openfst/archive/refs/tags/win/1.7.2.1.tar.gz
-    URL_HASH      SHA256=e04e1dabcecf3a687ace699ccb43a8a27da385777a56e69da6e103344cc66bca
-    PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/patch/openfst ${openfst_SOURCE_DIR}
+    URL           https://github.com/csukuangfj/openfst/archive/refs/tags/v1.8.5-2026-04-11.tar.gz
+    URL_HASH      SHA256=57fbc4b950ae81b1a0e1e298af15652da968a6723a592b7874e9b4027a80a5b4
+    # PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/patch/openfst ${openfst_SOURCE_DIR}
   )
   FetchContent_MakeAvailable(openfst)
-  add_dependencies(fst gflags glog)
-  target_link_libraries(fst PUBLIC gflags_nothreads_static glog)
+  # add_dependencies(fst gflags glog)
+  # target_link_libraries(fst PUBLIC gflags_nothreads_static glog)
   include_directories(${openfst_SOURCE_DIR}/src/include)
 else()
   set(openfst_BINARY_DIR ${build_DIR}/wenet-openfst-android-1.0.2.aar/jni)

runtime/processor/wetext_processor.cc

@@ -14,15 +14,15 @@
 
 #include "processor/wetext_processor.h"
 
-using fst::StringTokenType;
+using fst::TokenType;
 
 namespace wetext {
 Processor::Processor(const std::string& tagger_path,
                      const std::string& verbalizer_path) {
   tagger_.reset(StdVectorFst::Read(tagger_path));
   verbalizer_.reset(StdVectorFst::Read(verbalizer_path));
-  compiler_ = std::make_shared<StringCompiler<StdArc>>(StringTokenType::BYTE);
-  printer_ = std::make_shared<StringPrinter<StdArc>>(StringTokenType::BYTE);
+  compiler_ = std::make_shared<StringCompiler<StdArc>>(TokenType::BYTE);
+  printer_ = std::make_shared<StringPrinter<StdArc>>(TokenType::BYTE);
 
   if (tagger_path.find("zh_tn_") != tagger_path.npos) {
     parse_type_ = ParseType::kZH_TN;

runtime/test/processor_test.cc

@@ -28,7 +28,7 @@ std::vector<std::pair<std::string, std::string>> ParseTestCase(
   std::vector<std::pair<std::string, std::string>> test_cases;
   std::string line;
   while (getline(file, line)) {
-    CHECK_NE(line.find(delimiter), string::npos);
+    CHECK_NE(line.find(delimiter), std::string::npos);
     std::vector<std::string> arr;
     wetext::Split(line, delimiter, &arr);
     CHECK_GT(arr.size(), 0);

runtime/test/token_parser_test.cc

@@ -26,7 +26,7 @@ class TokenParserTest : public testing::Test {
   wetext::TokenParser* parser;
 
   virtual void SetUp() {
-    parser = new wetext::TokenParser(wetext::ParseType::kTN);
+    parser = new wetext::TokenParser(wetext::ParseType::kZH_TN);
   }
 
   virtual void TearDown() { delete parser; }