Update openfst to v1.8.5 and fix compiler warnings. (k2-fsa#3495)

Author: csukuangfj

CMakeLists.txt

@@ -7,6 +7,15 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 # https://cmake.org/cmake/help/latest/prop_tgt/MSVC_RUNTIME_LIBRARY.html
 cmake_policy(SET CMP0091 NEW)
 
+if(POLICY CMP0169)
+  cmake_policy(SET CMP0169 OLD)
+  set(CMAKE_POLICY_DEFAULT_CMP0169 OLD)
+endif()
+
+if(POLICY CMP0177)
+  cmake_policy(SET CMP0177 NEW)
+endif()
+
 message(STATUS "CMake version: ${CMAKE_VERSION}")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum OS X deployment version. Used only for macOS")
@@ -148,6 +157,8 @@ if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release)
 endif()
 
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE BOOL "")
+
 if(DEFINED ANDROID_ABI AND NOT SHERPA_ONNX_ENABLE_JNI AND NOT SHERPA_ONNX_ENABLE_C_API)
   message(STATUS "Set SHERPA_ONNX_ENABLE_JNI to ON for Android")
   set(SHERPA_ONNX_ENABLE_JNI ON CACHE BOOL "" FORCE)
@@ -518,6 +529,10 @@ if(NOT BUILD_SHARED_LIBS AND CMAKE_SYSTEM_NAME STREQUAL Linux)
   endif()
 endif()
 
+if(SHERPA_ONNX_ENABLE_PYTHON)
+  include(pybind11)
+endif()
+
 include(kaldi-native-fbank)
 include(kaldi-decoder)
 include(onnxruntime)
@@ -531,10 +546,6 @@ if(SHERPA_ONNX_ENABLE_PORTAUDIO AND SHERPA_ONNX_ENABLE_BINARY)
   include(portaudio)
 endif()
 
-if(SHERPA_ONNX_ENABLE_PYTHON)
-  include(pybind11)
-endif()
-
 if(SHERPA_ONNX_ENABLE_TESTS)
   enable_testing()
   include(googletest)
@@ -624,6 +635,6 @@ install(
   FILES
     ${PROJECT_BINARY_DIR}/sherpa-onnx.pc
   DESTINATION
-    ./
+    .
 )
 message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")

build-ios.sh

@@ -53,6 +53,7 @@ cmake \
   -DCMAKE_BUILD_TYPE=Release \
   -DBUILD_SHARED_LIBS=OFF \
   -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
+  -DSHERPA_ONNX_ENABLE_BINARY=OFF \
   -DSHERPA_ONNX_ENABLE_TESTS=OFF \
   -DSHERPA_ONNX_ENABLE_CHECK=OFF \
   -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
@@ -62,7 +63,7 @@ cmake \
   -DDEPLOYMENT_TARGET=13.0 \
   -B build/simulator_x86_64
 
-cmake --build build/simulator_x86_64 -j 4 --verbose
+cmake --build build/simulator_x86_64 -j 4
 
 echo "Building for simulator (arm64)"
 
@@ -81,6 +82,7 @@ cmake \
   -DCMAKE_INSTALL_PREFIX=./install \
   -DBUILD_SHARED_LIBS=OFF \
   -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
+  -DSHERPA_ONNX_ENABLE_BINARY=OFF \
   -DSHERPA_ONNX_ENABLE_TESTS=OFF \
   -DSHERPA_ONNX_ENABLE_CHECK=OFF \
   -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
@@ -90,7 +92,7 @@ cmake \
   -DDEPLOYMENT_TARGET=13.0 \
   -B build/simulator_arm64
 
-cmake --build build/simulator_arm64 -j 4 --verbose
+cmake --build build/simulator_arm64 -j 4
 
 echo "Building for arm64"
 
@@ -111,6 +113,7 @@ cmake \
   -DCMAKE_BUILD_TYPE=Release \
   -DBUILD_SHARED_LIBS=OFF \
   -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
+  -DSHERPA_ONNX_ENABLE_BINARY=OFF \
   -DSHERPA_ONNX_ENABLE_TESTS=OFF \
   -DSHERPA_ONNX_ENABLE_CHECK=OFF \
   -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \

build-swift-macos.sh

@@ -22,7 +22,7 @@ cmake \
   -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
   ../
 
-make VERBOSE=1 -j4
+make -j4
 make install
 rm -fv ./install/include/cargs.h
 

cmake/kaldi-decoder.cmake

@@ -1,8 +1,8 @@
 function(download_kaldi_decoder)
   include(FetchContent)
 
-  set(kaldi_decoder_URL  "https://github.com/k2-fsa/kaldi-decoder/archive/refs/tags/v0.2.11.tar.gz")
-  set(kaldi_decoder_HASH "SHA256=85ca462535592541eb5ba6d21843009cf34738f51b28b71f84882a3694b528bf")
+  set(kaldi_decoder_URL  "https://github.com/k2-fsa/kaldi-decoder/archive/refs/tags/v0.3.0.tar.gz")
+  set(kaldi_decoder_HASH "SHA256=b9f34cfb4fd3b1344100eead79ef4d37aa15962274b9e3056de345021f76a1b0")
 
   set(KALDI_DECODER_BUILD_PYTHON OFF CACHE BOOL "" FORCE)
   set(KALDI_DECODER_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
@@ -11,11 +11,11 @@ function(download_kaldi_decoder)
   # If you don't have access to the Internet,
   # please pre-download kaldi-decoder
   set(possible_file_locations
-    $ENV{HOME}/Downloads/kaldi-decoder-0.2.11.tar.gz
-    ${CMAKE_SOURCE_DIR}/kaldi-decoder-0.2.11.tar.gz
-    ${CMAKE_BINARY_DIR}/kaldi-decoder-0.2.11.tar.gz
-    /tmp/kaldi-decoder-0.2.11.tar.gz
-    /star-fj/fangjun/download/github/kaldi-decoder-0.2.11.tar.gz
+    $ENV{HOME}/Downloads/kaldi-decoder-0.3.0.tar.gz
+    ${CMAKE_SOURCE_DIR}/kaldi-decoder-0.3.0.tar.gz
+    ${CMAKE_BINARY_DIR}/kaldi-decoder-0.3.0.tar.gz
+    /tmp/kaldi-decoder-0.3.0.tar.gz
+    /star-fj/fangjun/download/github/kaldi-decoder-0.3.0.tar.gz
   )
 
   foreach(f IN LISTS possible_file_locations)
@@ -48,6 +48,8 @@ function(download_kaldi_decoder)
     set(BUILD_SHARED_LIBS OFF)
   endif()
 
+  list(APPEND CMAKE_MODULE_PATH ${kaldi_decoder_SOURCE_DIR}/cmake)
+
   add_subdirectory(${kaldi_decoder_SOURCE_DIR} ${kaldi_decoder_BINARY_DIR} EXCLUDE_FROM_ALL)
 
   if(_build_shared_libs_bak)
@@ -68,6 +70,8 @@ function(download_kaldi_decoder)
     )
   endif()
 
+  set_target_properties(kaldifst_core PROPERTIES OUTPUT_NAME "sherpa-onnx-kaldifst-core")
+
   target_include_directories(kaldi-decoder-core
     INTERFACE
       ${kaldi-decoder_SOURCE_DIR}/

cmake/kaldi-native-fbank.cmake

@@ -49,7 +49,14 @@ function(download_kaldi_native_fbank)
     set(BUILD_SHARED_LIBS OFF)
   endif()
 
+  set(_cmake_warn_deprecated_bak "${CMAKE_WARN_DEPRECATED}")
+  set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)
   add_subdirectory(${kaldi_native_fbank_SOURCE_DIR} ${kaldi_native_fbank_BINARY_DIR} EXCLUDE_FROM_ALL)
+  set(CMAKE_WARN_DEPRECATED "${_cmake_warn_deprecated_bak}" CACHE BOOL "" FORCE)
+
+  if(TARGET kissfft AND (CMAKE_C_COMPILER_ID MATCHES "Clang"))
+    target_compile_options(kissfft PRIVATE -Wno-cast-align)
+  endif()
 
   if(_build_shared_libs_bak)
     set_target_properties(kaldi-native-fbank-core

cmake/kaldifst.cmake

@@ -3,25 +3,23 @@
 function(download_openfst)
   include(FetchContent)
 
-  set(openfst_URL  "https://github.com/csukuangfj/openfst/archive/refs/tags/sherpa-onnx-2024-06-19.tar.gz")
-  set(openfst_URL2 "https://hf-mirror.com/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/openfst-sherpa-onnx-2024-06-19.tar.gz")
-  set(openfst_HASH "SHA256=5c98e82cc509c5618502dde4860b8ea04d843850ed57e6d6b590b644b268853d")
+  set(openfst_URL  "https://github.com/csukuangfj/openfst/archive/refs/tags/v1.8.5-2026-04-11.tar.gz")
+  set(openfst_HASH "SHA256=57fbc4b950ae81b1a0e1e298af15652da968a6723a592b7874e9b4027a80a5b4")
 
   # If you don't have access to the Internet,
   # please pre-download it
   set(possible_file_locations
-    $ENV{HOME}/Downloads/openfst-sherpa-onnx-2024-06-19.tar.gz
-    ${CMAKE_SOURCE_DIR}/openfst-sherpa-onnx-2024-06-19.tar.gz
-    ${CMAKE_BINARY_DIR}/openfst-sherpa-onnx-2024-06-19.tar.gz
-    /tmp/openfst-sherpa-onnx-2024-06-19.tar.gz
-    /star-fj/fangjun/download/github/openfst-sherpa-onnx-2024-06-19.tar.gz
+    $ENV{HOME}/Downloads/openfst-1.8.5-2026-04-11.tar.gz
+    ${CMAKE_SOURCE_DIR}/openfst-1.8.5-2026-04-11.tar.gz
+    ${CMAKE_BINARY_DIR}/openfst-1.8.5-2026-04-11.tar.gz
+    /tmp/openfst-1.8.5-2026-04-11.tar.gz
+    /star-fj/fangjun/download/github/openfst-1.8.5-2026-04-11.tar.gz
   )
 
   foreach(f IN LISTS possible_file_locations)
     if(EXISTS ${f})
       set(openfst_URL  "${f}")
       file(TO_CMAKE_PATH "${openfst_URL}" openfst_URL)
-      set(openfst_URL2)
       break()
     endif()
   endforeach()
@@ -41,25 +39,10 @@ function(download_openfst)
   set(HAVE_PYTHON OFF CACHE BOOL "" FORCE)
   set(HAVE_SPECIAL OFF CACHE BOOL "" FORCE)
 
-  if(NOT WIN32)
-    FetchContent_Declare(openfst
-      URL
-        ${openfst_URL}
-        ${openfst_URL2}
-      URL_HASH          ${openfst_HASH}
-      PATCH_COMMAND
-        sed -i.bak s/enable_testing\(\)//g "src/CMakeLists.txt" &&
-        sed -i.bak s/add_subdirectory\(test\)//g "src/CMakeLists.txt" &&
-        sed -i.bak /message/d "src/script/CMakeLists.txt"
-        # sed -i.bak s/add_subdirectory\(script\)//g "src/CMakeLists.txt" &&
-        # sed -i.bak s/add_subdirectory\(extensions\)//g "src/CMakeLists.txt"
-    )
-  else()
-    FetchContent_Declare(openfst
-      URL               ${openfst_URL}
-      URL_HASH          ${openfst_HASH}
-    )
-  endif()
+  FetchContent_Declare(openfst
+    URL               ${openfst_URL}
+    URL_HASH          ${openfst_HASH}
+  )
 
   FetchContent_GetProperties(openfst)
   if(NOT openfst_POPULATED)
@@ -68,10 +51,8 @@ function(download_openfst)
   endif()
   message(STATUS "openfst is downloaded to ${openfst_SOURCE_DIR}")
 
-  if(_build_shared_libs_bak)
-    set(_build_shared_libs_bak ${BUILD_SHARED_LIBS})
-    set(BUILD_SHARED_LIBS OFF)
-  endif()
+  set(_build_shared_libs_bak ${BUILD_SHARED_LIBS})
+  set(BUILD_SHARED_LIBS OFF)
 
   add_subdirectory(${openfst_SOURCE_DIR} ${openfst_BINARY_DIR} EXCLUDE_FROM_ALL)
 
@@ -89,21 +70,6 @@ function(download_openfst)
 
   set_target_properties(fst PROPERTIES OUTPUT_NAME "sherpa-onnx-fst")
   set_target_properties(fstfar PROPERTIES OUTPUT_NAME "sherpa-onnx-fstfar")
-
-  if(LINUX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 11)
-    target_compile_options(fst PUBLIC -Wno-missing-template-keyword)
-  endif()
-
-  target_include_directories(fst
-    PUBLIC
-      ${openfst_SOURCE_DIR}/src/include
-  )
-
-  target_include_directories(fstfar
-    PUBLIC
-      ${openfst_SOURCE_DIR}/src/include
-  )
-  # installed in ./kaldi-decoder.cmake
 endfunction()
 
 download_openfst()

cmake/openfst.cmake

@@ -32,6 +32,8 @@ function(download_pybind11)
     URL_HASH          ${pybind11_HASH}
   )
 
+  set(PYBIND11_FINDPYTHON NEW CACHE STRING "" FORCE)
+
   FetchContent_GetProperties(pybind11)
   if(NOT pybind11_POPULATED)
     message(STATUS "Downloading pybind11 from ${pybind11_URL}")

cmake/pybind11.cmake

@@ -50,6 +50,10 @@ function(download_simple_sentencepiece)
 
   add_subdirectory(${simple-sentencepiece_SOURCE_DIR} ${simple-sentencepiece_BINARY_DIR} EXCLUDE_FROM_ALL)
 
+  if(TARGET ssentencepiece_core AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+    target_compile_options(ssentencepiece_core PRIVATE -Wno-deprecated-declarations)
+  endif()
+
   if(_build_shared_libs_bak)
     set_target_properties(ssentencepiece_core
       PROPERTIES

cmake/simple-sentencepiece.cmake

@@ -327,6 +327,14 @@ if(SHERPA_ONNX_ENABLE_SPEAKER_DIARIZATION)
   )
 endif()
 
+if(APPLE)
+  set_source_files_properties(
+    fast-clustering.cc
+    PROPERTIES
+      COMPILE_OPTIONS "-Wno-unknown-pragmas"
+  )
+endif()
+
 if(SHERPA_ONNX_ENABLE_CHECK)
   list(APPEND sources log.cc)
 endif()