解决windwos 加载lm模型失败 (#1093)

* fix vc compatibility

* fix windwos load lm model failed
This commit is contained in:
cdevelop 2023-11-15 19:46:00 +08:00 committed by GitHub
parent 12d694f94c
commit eff2570faf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 4 deletions

View File

@ -55,7 +55,10 @@ if(ENABLE_FST)
# with some patch to fix the make errors.
add_subdirectory(third_party/openfst)
include_directories(${openfst_SOURCE_DIR}/src/include)
if(WIN32)
include_directories(${openfst_SOURCE_DIR}/src/lib)
endif()
endif()
add_subdirectory(third_party/yaml-cpp)

View File

@ -7,6 +7,7 @@ message("files: "${files})
if(WIN32)
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/execution-charset:utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/source-charset:utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/bigobj>")
endif()
add_library(funasr SHARED ${files})

View File

@ -1,5 +1,7 @@
#include "bias-lm.h"
#ifdef _WIN32
#include "fst-types.cc"
#endif
namespace funasr {
void print(std::queue<StateId> &q) {
std::queue<StateId> data = q;

View File

@ -1,6 +1,20 @@
FILE(GLOB HEADER_FILES ../include/fst/*.h)
if(WIN32)
add_library(fst STATIC
compat.cc
flags.cc
fst-types.cc
fst.cc
mapped-file.cc
properties.cc
symbol-table.cc
symbol-table-ops.cc
util.cc
weight.cc
${HEADER_FILES}
)
else()
add_library(fst
compat.cc
flags.cc
@ -14,6 +28,8 @@ add_library(fst
weight.cc
${HEADER_FILES}
)
endif()
set_target_properties(fst PROPERTIES
SOVERSION "${SOVERSION}"
)

View File

@ -111,7 +111,9 @@ if(ENABLE_FST)
# with some patch to fix the make errors.
add_subdirectory(${PROJECT_SOURCE_DIR}/../onnxruntime/third_party/openfst openfst)
include_directories(${openfst_SOURCE_DIR}/src/include)
if(WIN32)
include_directories(${openfst_SOURCE_DIR}/src/lib)
endif()
endif()