Skip to content

fix(onnxruntime): Fix Windows MSVC compilation errors #2841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imdenny wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(onnxruntime): Fix Windows MSVC compilation errors #2841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f71126
fix(onnxruntime): Fix Windows MSVC compilation errors
imdenny Apr 6, 2026
2204a0c
Add realtime mic app and optional FFmpeg build
imdenny May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion runtime/onnxruntime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ project(FunASROnnx)

option(ENABLE_GLOG "Whether to build glog" ON)
option(ENABLE_FST "Whether to build openfst" ON) # ITN need openfst compiled
option(ENABLE_FFMPEG "Whether to enable ffmpeg audio decoding" OFF)
option(GPU "Whether to build with GPU" OFF)

# set(CMAKE_CXX_STANDARD 11)
Expand Down Expand Up @@ -40,7 +41,9 @@ IF(WIN32)
${PROJECT_SOURCE_DIR}/third_party/glog/src/glog/vlog_is_on.h)
ELSE()
link_directories(${ONNXRUNTIME_DIR}/lib)
link_directories(${FFMPEG_DIR}/lib)
if(ENABLE_FFMPEG AND NOT APPLE)
link_directories(${FFMPEG_DIR}/lib)
endif()
endif()
include_directories(${CMAKE_SOURCE_DIR}/src)
include_directories(${PROJECT_SOURCE_DIR}/third_party/kaldi-native-fbank)
Expand Down
2 changes: 2 additions & 0 deletions runtime/onnxruntime/bin/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ if(WIN32)
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/execution-charset:utf-8>")
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/source-charset:utf-8>")
include_directories(${ONNXRUNTIME_DIR}/include)
if(ENABLE_FFMPEG)
include_directories(${FFMPEG_DIR}/include)
endif()
include_directories(${PROJECT_SOURCE_DIR}/third_party)
SET(RELATION_SOURCE "../src/resample.cpp" "../src/util.cpp" "../src/alignedmem.cpp" "../src/encode_converter.cpp")
endif()
Expand Down
1 change: 1 addition & 0 deletions runtime/onnxruntime/realtime-mic
Open in desktop
Submodule realtime-mic added at 3154dd
17 changes: 10 additions & 7 deletions runtime/onnxruntime/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if(GPU)
set(files ${files} "${CMAKE_CURRENT_SOURCE_DIR}/paraformer-torch.cpp")
endif()

message("files: "${files})
message("files: ${files}")

if(WIN32)
add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/execution-charset:utf-8>")
Expand All @@ -22,22 +22,25 @@ endif()
add_library(funasr SHARED ${files})

if(WIN32)
set(EXTRA_LIBS yaml-cpp csrc kaldi-decoder fst glog gflags avutil avcodec avformat swresample onnxruntime)
set(EXTRA_LIBS yaml-cpp csrc kaldi-decoder fst glog gflags onnxruntime)
include_directories(${ONNXRUNTIME_DIR}/include)
include_directories(${FFMPEG_DIR}/include)
target_link_directories(funasr PUBLIC ${ONNXRUNTIME_DIR}/lib)
target_link_directories(funasr PUBLIC ${FFMPEG_DIR}/lib)
target_compile_definitions(funasr PUBLIC -D_FUNASR_API_EXPORT -DNOMINMAX -DYAML_CPP_DLL)
else()
set(EXTRA_LIBS pthread yaml-cpp csrc kaldi-decoder fst glog gflags avutil avcodec avformat swresample)
set(EXTRA_LIBS pthread yaml-cpp csrc kaldi-decoder fst glog gflags)
include_directories(${ONNXRUNTIME_DIR}/include)
include_directories(${FFMPEG_DIR}/include)
if(APPLE)
target_link_directories(funasr PUBLIC ${ONNXRUNTIME_DIR}/lib)
target_link_directories(funasr PUBLIC ${FFMPEG_DIR}/lib)
endif(APPLE)
endif()

if(ENABLE_FFMPEG AND NOT APPLE)
target_compile_definitions(funasr PUBLIC -DENABLE_FFMPEG)
include_directories(${FFMPEG_DIR}/include)
target_link_directories(funasr PUBLIC ${FFMPEG_DIR}/lib)
target_link_libraries(funasr PUBLIC avutil avcodec avformat swresample)
endif()

if(GPU)
set(TORCH_DEPS torch torch_cuda torch_cpu c10 c10_cuda torch_blade ral_base_context)
endif()
Expand Down
8 changes: 5 additions & 3 deletions runtime/onnxruntime/src/audio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#pragma warning(disable:4996)
#endif

#if defined(__APPLE__)
#if defined(__APPLE__) || !defined(ENABLE_FFMPEG)
#include <string.h>
#else

Expand Down Expand Up @@ -284,7 +284,8 @@ void Audio::WavResample(int32_t sampling_rate, const float *waveform,
}

bool Audio::FfmpegLoad(const char *filename, bool copy2char){
#if defined(__APPLE__)
#if defined(__APPLE__) || !defined(ENABLE_FFMPEG)
LOG(ERROR) << "FFmpeg audio decoding is disabled in this build.";
return false;
#else
// from file
Expand Down Expand Up @@ -446,7 +447,8 @@ bool Audio::FfmpegLoad(const char *filename, bool copy2char){
}

bool Audio::FfmpegLoad(const char* buf, int n_file_len){
#if defined(__APPLE__)
#if defined(__APPLE__) || !defined(ENABLE_FFMPEG)
LOG(ERROR) << "FFmpeg audio decoding is disabled in this build.";
return false;
#else
// from buf
Expand Down
2 changes: 1 addition & 1 deletion runtime/onnxruntime/src/ct-transformer-online.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ string CTTransformerOnline::AddPunc(const char* sz_input, vector<string> &arr_ca
strText = accumulate(arr_cache.begin(), arr_cache.end(), strText);

// 如果上一句的结尾是英语字母，并且这一句的开始也是英语字母，应该添加空格
if ((strText.size() > 0 and !(strText[strText.size()-1] & 0x80)) && (strlen(sz_input) > 0 && !(sz_input[0] & 0x80)))
if ((strText.size() > 0 && !(strText[strText.size()-1] & 0x80)) && (strlen(sz_input) > 0 && !(sz_input[0] & 0x80)))
strText += " ";

strText += sz_input; // full_text = precache + text
Expand Down
3 changes: 2 additions & 1 deletion runtime/onnxruntime/third_party/kaldi/base/kaldi-types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ typedef float BaseFloat;

#ifdef _MSC_VER
#include <basetsd.h>
#define ssize_t SSIZE_T
// Don't define ssize_t as macro - let fst/types.h handle it
// #define ssize_t SSIZE_T // This causes conflicts with fst/types.h
Comment on lines +35 to +36
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Avoid leaving commented-out code in the codebase. Since the ssize_t macro is being removed to avoid conflicts and is now handled by fst/types.h, the dead code should be deleted entirely to maintain cleanliness. The explanatory comment is sufficient on its own.

Suggested change
// Don't define ssize_t as macro - let fst/types.h handle it
// #define ssize_t SSIZE_T // This causes conflicts with fst/types.h
// Don't define ssize_t as macro - let fst/types.h handle it

#endif

// we can do this a different way if some platform
Expand Down
4 changes: 4 additions & 0 deletions runtime/onnxruntime/third_party/openfst/src/include/fst/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ using uint64 = uint64_t;
#ifdef _MSC_VER
// Not really Windows-specific: they should have used ptrdiff_t in the first
// place. But on Windows there has never been ssize_t.
// Check if ssize_t/SSIZE_T is already defined by the SDK
#if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
// Use ptrdiff_t as ssize_t (same size as pointer)
using ssize_t = std::ptrdiff_t;
#endif // !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
#endif // _MSC_VER

#endif // FST_LIB_TYPES_H_
6 changes: 3 additions & 3 deletions runtime/onnxruntime/third_party/yaml-cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
###
## Due to Mac OSX we need to keep compatibility with CMake 2.6
# see http://www.cmake.org/Wiki/CMake_Policies
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8.12)
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The minimum CMake version has been increased to 2.8.12, but the comment on line 4 still refers to compatibility with version 2.6. Please update the comment to ensure it remains consistent with the actual code requirements.

# see http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0012
if(POLICY CMP0012)
cmake_policy(SET CMP0012 OLD)
cmake_policy(SET CMP0012 NEW)
endif()
# see http://www.cmake.org/cmake/help/cmake-2-8-docs.html#policy:CMP0015
if(POLICY CMP0015)
cmake_policy(SET CMP0015 OLD)
cmake_policy(SET CMP0015 NEW)
endif()
# see https://cmake.org/cmake/help/latest/policy/CMP0042.html
if(POLICY CMP0042)
Expand Down