Skip to content

Commit d958953

Browse files
ZillaRUZillaRU
committed
backup
1 parent 11bbe6d commit d958953

13 files changed

+561
-942
lines changed

‎sherpa-onnx/csrc/CMakeLists-untool.txt

+106
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
include_directories(${CMAKE_SOURCE_DIR})
2+
3+
if(SHERPA_ONNX_ENABLE_PYTHON)
4+
message(STATUS "PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")
5+
execute_process(
6+
COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; print('.'.join(sys.version.split('.')[:2]))"
7+
OUTPUT_STRIP_TRAILING_WHITESPACE
8+
OUTPUT_VARIABLE PYTHON_VERSION
9+
)
10+
message(STATUS "PYTHON_VERSION: ${PYTHON_VERSION}")
11+
endif()
12+
13+
set(sources
14+
base64-decode.cc
15+
cat.cc
16+
circular-buffer.cc
17+
context-graph.cc
18+
endpoint.cc
19+
features.cc
20+
file-utils.cc
21+
hypothesis.cc
22+
online-model-config.cc
23+
online-recognizer-impl.cc
24+
online-recognizer.cc
25+
online-stream.cc
26+
online-transducer-decoder.cc
27+
online-transducer-greedy-search-decoder.cc
28+
online-transducer-model-config.cc
29+
online-transducer-model.cc
30+
onnx-utils.cc
31+
onnx-to-unt.cc
32+
pad-sequence.cc
33+
parse-options.cc
34+
provider.cc
35+
resample.cc
36+
session.cc
37+
symbol-table.cc
38+
text-utils.cc
39+
transpose.cc
40+
unbind.cc
41+
utils.cc
42+
wave-reader.cc
43+
)
44+
45+
if(SHERPA_ONNX_ENABLE_CHECK)
46+
list(APPEND sources log.cc)
47+
endif()
48+
list(APPEND sources alsa.cc)
49+
add_executable(sherpa-onnx-alsa sherpa-onnx-alsa.cc ${sources})
50+
51+
52+
target_link_libraries(sherpa-onnx-alsa
53+
kaldi-native-fbank-core
54+
kaldi-decoder-core
55+
)
56+
57+
58+
if(BUILD_SHARED_LIBS)
59+
target_link_libraries(sherpa-onnx-alsa onnxruntime)
60+
else()
61+
target_link_libraries(sherpa-onnx-alsa ${onnxruntime_lib_files})
62+
endif()
63+
64+
# target_include_directories(sherpa-onnx-alsa PUBLIC ${CMAKE_SOURCE_DIR})
65+
66+
target_link_libraries(sherpa-onnx-alsa -lm)
67+
68+
target_include_directories(sherpa-onnx-alsa PRIVATE ${LIBSOPHON}/include)
69+
link_directories(${LIBSOPHON}/lib)
70+
target_link_libraries(sherpa-onnx-alsa bmlib libbmodel.a bmrt)
71+
target_include_directories(sherpa-onnx-alsa PRIVATE /data/untool/include)
72+
73+
74+
75+
if(SHERPA_ONNX_ENABLE_CHECK)
76+
target_compile_definitions(sherpa-onnx-alsa PUBLIC SHERPA_ONNX_ENABLE_CHECK=1)
77+
78+
if(SHERPA_ONNX_HAVE_EXECINFO_H)
79+
target_compile_definitions(sherpa-onnx-alsa PRIVATE SHERPA_ONNX_HAVE_EXECINFO_H=1)
80+
endif()
81+
82+
if(SHERPA_ONNX_HAVE_CXXABI_H)
83+
target_compile_definitions(sherpa-onnx-alsa PRIVATE SHERPA_ONNX_HAVE_CXXABI_H=1)
84+
endif()
85+
endif()
86+
87+
if(NOT BUILD_SHARED_LIBS AND CMAKE_SYSTEM_NAME STREQUAL Linux)
88+
target_link_libraries(sherpa-onnx-alsa -ldl)
89+
endif()
90+
91+
if(NOT WIN32 AND NOT SHERPA_ONNX_ENABLE_WASM AND CMAKE_SYSTEM_NAME STREQUAL Linux)
92+
target_link_libraries(sherpa-onnx-alsa -pthread)
93+
endif()
94+
95+
target_link_libraries(sherpa-onnx-alsa "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib")
96+
target_link_libraries(sherpa-onnx-alsa "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../../../sherpa_onnx/lib")
97+
98+
99+
if(SHERPA_ONNX_ENABLE_BINARY)
100+
install(
101+
TARGETS
102+
sherpa-onnx-alsa
103+
DESTINATION
104+
bin
105+
)
106+
endif()

‎sherpa-onnx/csrc/CMakeLists.txt

+136-21
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@ set(sources
2727
online-transducer-greedy-search-decoder.cc
2828
online-transducer-model-config.cc
2929
online-transducer-model.cc
30+
online-zipformer-transducer-model.cc
3031
onnx-utils.cc
31-
onnx-to-unt.cc
32+
onnx-to-bm.cc
3233
pad-sequence.cc
3334
parse-options.cc
3435
provider.cc
@@ -45,62 +46,176 @@ set(sources
4546
if(SHERPA_ONNX_ENABLE_CHECK)
4647
list(APPEND sources log.cc)
4748
endif()
48-
list(APPEND sources alsa.cc)
49-
add_executable(sherpa-onnx-alsa sherpa-onnx-alsa.cc ${sources})
49+
add_library(sherpa-onnx-core ${sources})
50+
if(APPLE)
51+
target_compile_options(sherpa-onnx-core PRIVATE
52+
-Wno-deprecated-declarations
53+
)
54+
endif()
5055

5156

52-
target_link_libraries(sherpa-onnx-alsa
57+
target_link_libraries(sherpa-onnx-core
5358
kaldi-native-fbank-core
5459
kaldi-decoder-core
5560
)
5661

5762

5863
if(BUILD_SHARED_LIBS)
59-
target_link_libraries(sherpa-onnx-alsa onnxruntime)
64+
target_link_libraries(sherpa-onnx-core onnxruntime)
6065
else()
61-
target_link_libraries(sherpa-onnx-alsa ${onnxruntime_lib_files})
66+
target_link_libraries(sherpa-onnx-core ${onnxruntime_lib_files})
6267
endif()
6368

64-
# target_include_directories(sherpa-onnx-alsa PUBLIC ${CMAKE_SOURCE_DIR})
65-
66-
target_link_libraries(sherpa-onnx-alsa -lm)
69+
# target_include_directories(sherpa-onnx-core PUBLIC ${CMAKE_SOURCE_DIR})
70+
target_include_directories(sherpa-onnx-core PUBLIC /opt/sophon/libsophon-0.5.0/include)
71+
link_directories(/data/Qwen/lib_soc)
6772

68-
target_include_directories(sherpa-onnx-alsa PRIVATE ${LIBSOPHON}/include)
69-
link_directories(${LIBSOPHON}/lib)
70-
target_link_libraries(sherpa-onnx-alsa bmlib libbmodel.a bmrt)
71-
target_include_directories(sherpa-onnx-alsa PRIVATE /data/untool/include)
73+
target_link_libraries(sherpa-onnx-core -lm)
7274

75+
target_link_libraries(sherpa-onnx-core bmrt bmlib)
7376

77+
if(SHERPA_ONNX_ENABLE_TTS)
78+
target_link_libraries(sherpa-onnx-core piper_phonemize)
79+
endif()
7480

7581
if(SHERPA_ONNX_ENABLE_CHECK)
76-
target_compile_definitions(sherpa-onnx-alsa PUBLIC SHERPA_ONNX_ENABLE_CHECK=1)
82+
target_compile_definitions(sherpa-onnx-core PUBLIC SHERPA_ONNX_ENABLE_CHECK=1)
7783

7884
if(SHERPA_ONNX_HAVE_EXECINFO_H)
79-
target_compile_definitions(sherpa-onnx-alsa PRIVATE SHERPA_ONNX_HAVE_EXECINFO_H=1)
85+
target_compile_definitions(sherpa-onnx-core PRIVATE SHERPA_ONNX_HAVE_EXECINFO_H=1)
8086
endif()
8187

8288
if(SHERPA_ONNX_HAVE_CXXABI_H)
83-
target_compile_definitions(sherpa-onnx-alsa PRIVATE SHERPA_ONNX_HAVE_CXXABI_H=1)
89+
target_compile_definitions(sherpa-onnx-core PRIVATE SHERPA_ONNX_HAVE_CXXABI_H=1)
8490
endif()
8591
endif()
8692

8793
if(NOT BUILD_SHARED_LIBS AND CMAKE_SYSTEM_NAME STREQUAL Linux)
88-
target_link_libraries(sherpa-onnx-alsa -ldl)
94+
target_link_libraries(sherpa-onnx-core -ldl)
8995
endif()
9096

9197
if(NOT WIN32 AND NOT SHERPA_ONNX_ENABLE_WASM AND CMAKE_SYSTEM_NAME STREQUAL Linux)
92-
target_link_libraries(sherpa-onnx-alsa -pthread)
98+
target_link_libraries(sherpa-onnx-core -pthread)
9399
endif()
94100

95-
target_link_libraries(sherpa-onnx-alsa "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib")
96-
target_link_libraries(sherpa-onnx-alsa "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../../../sherpa_onnx/lib")
101+
if(SHERPA_ONNX_ENABLE_BINARY)
102+
add_executable(sherpa-onnx sherpa-onnx.cc)
97103

104+
set(main_exes
105+
sherpa-onnx
106+
)
107+
108+
foreach(exe IN LISTS main_exes)
109+
target_link_libraries(${exe} sherpa-onnx-core)
110+
#target_include_directories(${exe} PRIVATE /data/untool/include)
111+
endforeach()
112+
113+
if(NOT WIN32)
114+
foreach(exe IN LISTS main_exes)
115+
target_link_libraries(${exe} "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib")
116+
target_link_libraries(${exe} "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../../../sherpa_onnx/lib")
117+
118+
if(SHERPA_ONNX_ENABLE_PYTHON)
119+
target_link_libraries(${exe} "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib/python${PYTHON_VERSION}/site-packages/sherpa_onnx/lib")
120+
endif()
121+
endforeach()
122+
endif()
123+
endif()
124+
125+
if(SHERPA_ONNX_ENABLE_PYTHON AND WIN32)
126+
install(TARGETS sherpa-onnx-core DESTINATION ..)
127+
else()
128+
install(TARGETS sherpa-onnx-core DESTINATION lib)
129+
endif()
130+
131+
if(WIN32 AND BUILD_SHARED_LIBS)
132+
install(TARGETS sherpa-onnx-core DESTINATION bin)
133+
endif()
98134

99135
if(SHERPA_ONNX_ENABLE_BINARY)
100136
install(
101137
TARGETS
102-
sherpa-onnx-alsa
138+
${main_exes}
103139
DESTINATION
104140
bin
105141
)
106142
endif()
143+
144+
if(SHERPA_ONNX_HAS_ALSA AND SHERPA_ONNX_ENABLE_BINARY)
145+
message("add alsa ==========================================")
146+
add_executable(sherpa-onnx-alsa sherpa-onnx-alsa.cc alsa.cc)
147+
148+
set(exes
149+
sherpa-onnx-alsa
150+
)
151+
152+
foreach(exe IN LISTS exes)
153+
target_link_libraries(${exe} sherpa-onnx-core)
154+
#target_include_directories(${exe} PRIVATE /data/untool/include)
155+
endforeach()
156+
157+
foreach(exe IN LISTS exes)
158+
if(DEFINED ENV{SHERPA_ONNX_ALSA_LIB_DIR})
159+
target_link_libraries(${exe} -L$ENV{SHERPA_ONNX_ALSA_LIB_DIR} -lasound)
160+
else()
161+
target_link_libraries(${exe} asound)
162+
endif()
163+
endforeach()
164+
165+
if(NOT WIN32)
166+
foreach(exe IN LISTS exes)
167+
target_link_libraries(${exe} "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib")
168+
target_link_libraries(${exe} "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../../../sherpa_onnx/lib")
169+
endforeach()
170+
171+
if(SHERPA_ONNX_ENABLE_PYTHON)
172+
foreach(exe IN LISTS exes)
173+
target_link_libraries(${exe} "-Wl,-rpath,${SHERPA_ONNX_RPATH_ORIGIN}/../lib/python${PYTHON_VERSION}/site-packages/sherpa_onnx/lib")
174+
endforeach()
175+
endif()
176+
endif()
177+
178+
install(
179+
TARGETS ${exes}
180+
DESTINATION
181+
bin
182+
)
183+
endif()
184+
185+
if(SHERPA_ONNX_ENABLE_TESTS)
186+
set(sherpa_onnx_test_srcs
187+
cat-test.cc
188+
circular-buffer-test.cc
189+
context-graph-test.cc
190+
pad-sequence-test.cc
191+
transpose-test.cc
192+
unbind-test.cc
193+
utfcpp-test.cc
194+
)
195+
196+
list(APPEND sherpa_onnx_test_srcs
197+
speaker-embedding-manager-test.cc
198+
)
199+
200+
function(sherpa_onnx_add_test source)
201+
get_filename_component(name ${source} NAME_WE)
202+
set(target_name ${name})
203+
add_executable(${target_name} "${source}")
204+
205+
target_link_libraries(${target_name}
206+
PRIVATE
207+
gtest
208+
gtest_main
209+
sherpa-onnx-core
210+
)
211+
212+
add_test(NAME "${target_name}"
213+
COMMAND
214+
$<TARGET_FILE:${target_name}>
215+
)
216+
endfunction()
217+
218+
foreach(source IN LISTS sherpa_onnx_test_srcs)
219+
sherpa_onnx_add_test(${source})
220+
endforeach()
221+
endif()

0 commit comments

Comments
 (0)