xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
0bb325ce 1 parent 8e682652

Fix building sherpa-onnx (#2262)

内嵌 并排对比
正在显示 7 个修改的文件 包含 11 行增加 和 3 行删除
@@ -125,7 +125,7 @@ cmake --build build/os64 --target install @@ -125,7 +125,7 @@ cmake --build build/os64 --target install
125 echo "Generate xcframework" 125 echo "Generate xcframework"
126 126
127 mkdir -p "build/simulator/lib" 127 mkdir -p "build/simulator/lib"
128 -for f in libkaldi-native-fbank-core.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \ 128 +for f in libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
129 libsherpa-onnx-fst.a libsherpa-onnx-fstfar.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a libssentencepiece_core.a; do 129 libsherpa-onnx-fst.a libsherpa-onnx-fstfar.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a libssentencepiece_core.a; do
130 lipo -create build/simulator_arm64/lib/${f} \ 130 lipo -create build/simulator_arm64/lib/${f} \
131 build/simulator_x86_64/lib/${f} \ 131 build/simulator_x86_64/lib/${f} \
@@ -136,6 +136,7 @@ done @@ -136,6 +136,7 @@ done
136 # cannot accept multi archive with the same architecture. 136 # cannot accept multi archive with the same architecture.
137 libtool -static -o build/simulator/sherpa-onnx.a \ 137 libtool -static -o build/simulator/sherpa-onnx.a \
138 build/simulator/lib/libkaldi-native-fbank-core.a \ 138 build/simulator/lib/libkaldi-native-fbank-core.a \
  139 + build/simulator/lib/libkissfft-float.a \
139 build/simulator/lib/libsherpa-onnx-c-api.a \ 140 build/simulator/lib/libsherpa-onnx-c-api.a \
140 build/simulator/lib/libsherpa-onnx-core.a \ 141 build/simulator/lib/libsherpa-onnx-core.a \
141 build/simulator/lib/libsherpa-onnx-fst.a \ 142 build/simulator/lib/libsherpa-onnx-fst.a \
@@ -146,6 +147,7 @@ libtool -static -o build/simulator/sherpa-onnx.a \ @@ -146,6 +147,7 @@ libtool -static -o build/simulator/sherpa-onnx.a \
146 147
147 libtool -static -o build/os64/sherpa-onnx.a \ 148 libtool -static -o build/os64/sherpa-onnx.a \
148 build/os64/lib/libkaldi-native-fbank-core.a \ 149 build/os64/lib/libkaldi-native-fbank-core.a \
  150 + build/os64/lib/libkissfft-float.a \
149 build/os64/lib/libsherpa-onnx-c-api.a \ 151 build/os64/lib/libsherpa-onnx-c-api.a \
150 build/os64/lib/libsherpa-onnx-core.a \ 152 build/os64/lib/libsherpa-onnx-core.a \
151 build/os64/lib/libsherpa-onnx-fst.a \ 153 build/os64/lib/libsherpa-onnx-fst.a \
@@ -127,7 +127,7 @@ cmake --build build/os64 --target install @@ -127,7 +127,7 @@ cmake --build build/os64 --target install
127 echo "Generate xcframework" 127 echo "Generate xcframework"
128 128
129 mkdir -p "build/simulator/lib" 129 mkdir -p "build/simulator/lib"
130 -for f in libkaldi-native-fbank-core.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \ 130 +for f in libkaldi-native-fbank-core.a libkissfft-float.a libsherpa-onnx-c-api.a libsherpa-onnx-core.a \
131 libsherpa-onnx-fstfar.a libssentencepiece_core.a \ 131 libsherpa-onnx-fstfar.a libssentencepiece_core.a \
132 libsherpa-onnx-fst.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a \ 132 libsherpa-onnx-fst.a libsherpa-onnx-kaldifst-core.a libkaldi-decoder-core.a \
133 libucd.a libpiper_phonemize.a libespeak-ng.a; do 133 libucd.a libpiper_phonemize.a libespeak-ng.a; do
@@ -140,6 +140,7 @@ done @@ -140,6 +140,7 @@ done
140 # cannot accept multi archive with the same architecture. 140 # cannot accept multi archive with the same architecture.
141 libtool -static -o build/simulator/sherpa-onnx.a \ 141 libtool -static -o build/simulator/sherpa-onnx.a \
142 build/simulator/lib/libkaldi-native-fbank-core.a \ 142 build/simulator/lib/libkaldi-native-fbank-core.a \
  143 + build/simulator/lib/libkissfft-float.a \
143 build/simulator/lib/libsherpa-onnx-c-api.a \ 144 build/simulator/lib/libsherpa-onnx-c-api.a \
144 build/simulator/lib/libsherpa-onnx-core.a \ 145 build/simulator/lib/libsherpa-onnx-core.a \
145 build/simulator/lib/libsherpa-onnx-fstfar.a \ 146 build/simulator/lib/libsherpa-onnx-fstfar.a \
@@ -153,6 +154,7 @@ libtool -static -o build/simulator/sherpa-onnx.a \ @@ -153,6 +154,7 @@ libtool -static -o build/simulator/sherpa-onnx.a \
153 154
154 libtool -static -o build/os64/sherpa-onnx.a \ 155 libtool -static -o build/os64/sherpa-onnx.a \
155 build/os64/lib/libkaldi-native-fbank-core.a \ 156 build/os64/lib/libkaldi-native-fbank-core.a \
  157 + build/os64/lib/libkissfft-float.a \
156 build/os64/lib/libsherpa-onnx-c-api.a \ 158 build/os64/lib/libsherpa-onnx-c-api.a \
157 build/os64/lib/libsherpa-onnx-core.a \ 159 build/os64/lib/libsherpa-onnx-core.a \
158 build/os64/lib/libsherpa-onnx-fstfar.a \ 160 build/os64/lib/libsherpa-onnx-fstfar.a \
@@ -30,6 +30,7 @@ libtool -static -o ./install/lib/libsherpa-onnx.a \ @@ -30,6 +30,7 @@ libtool -static -o ./install/lib/libsherpa-onnx.a \
30 ./install/lib/libsherpa-onnx-c-api.a \ 30 ./install/lib/libsherpa-onnx-c-api.a \
31 ./install/lib/libsherpa-onnx-core.a \ 31 ./install/lib/libsherpa-onnx-core.a \
32 ./install/lib/libkaldi-native-fbank-core.a \ 32 ./install/lib/libkaldi-native-fbank-core.a \
  33 + ./install/lib/libkissfft-float.a \
33 ./install/lib/libsherpa-onnx-fstfar.a \ 34 ./install/lib/libsherpa-onnx-fstfar.a \
34 ./install/lib/libsherpa-onnx-fst.a \ 35 ./install/lib/libsherpa-onnx-fst.a \
35 ./install/lib/libsherpa-onnx-kaldifst-core.a \ 36 ./install/lib/libsherpa-onnx-kaldifst-core.a \
@@ -4,7 +4,7 @@ CUR_DIR :=$(shell pwd) @@ -4,7 +4,7 @@ CUR_DIR :=$(shell pwd)
4 CFLAGS := -I ../ -I ../build/_deps/cargs-src/include/ 4 CFLAGS := -I ../ -I ../build/_deps/cargs-src/include/
5 LDFLAGS := -L ../build/lib 5 LDFLAGS := -L ../build/lib
6 LDFLAGS += -L ../build/_deps/onnxruntime-src/lib 6 LDFLAGS += -L ../build/_deps/onnxruntime-src/lib
7 -LDFLAGS += -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lpiper_phonemize -lespeak-ng -lucd -lcargs -lonnxruntime 7 +LDFLAGS += -lsherpa-onnx-c-api -lsherpa-onnx-core -lkaldi-decoder-core -lsherpa-onnx-kaldifst-core -lsherpa-onnx-fstfar -lsherpa-onnx-fst -lkaldi-native-fbank-core -lkissfft-float -lpiper_phonemize -lespeak-ng -lucd -lcargs -lonnxruntime
8 LDFLAGS += -framework Foundation 8 LDFLAGS += -framework Foundation
9 LDFLAGS += -lc++ 9 LDFLAGS += -lc++
10 LDFLAGS += -Wl,-rpath,${CUR_DIR}/../build/lib 10 LDFLAGS += -Wl,-rpath,${CUR_DIR}/../build/lib
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 sherpa-onnx-fstfar.lib; 14 sherpa-onnx-fstfar.lib;
15 sherpa-onnx-fst.lib; 15 sherpa-onnx-fst.lib;
16 kaldi-native-fbank-core.lib; 16 kaldi-native-fbank-core.lib;
  17 + kissfft-float.lib;
17 onnxruntime.lib; 18 onnxruntime.lib;
18 piper_phonemize.lib; 19 piper_phonemize.lib;
19 espeak-ng.lib; 20 espeak-ng.lib;
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 sherpa-onnx-fstfar.lib; 14 sherpa-onnx-fstfar.lib;
15 sherpa-onnx-fst.lib; 15 sherpa-onnx-fst.lib;
16 kaldi-native-fbank-core.lib; 16 kaldi-native-fbank-core.lib;
  17 + kissfft-float.lib;
17 onnxruntime.lib; 18 onnxruntime.lib;
18 piper_phonemize.lib; 19 piper_phonemize.lib;
19 espeak-ng.lib; 20 espeak-ng.lib;
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 sherpa-onnx-fstfar.lib; 14 sherpa-onnx-fstfar.lib;
15 sherpa-onnx-fst.lib; 15 sherpa-onnx-fst.lib;
16 kaldi-native-fbank-core.lib; 16 kaldi-native-fbank-core.lib;
  17 + kissfft-float.lib;
17 onnxruntime.lib; 18 onnxruntime.lib;
18 piper_phonemize.lib; 19 piper_phonemize.lib;
19 espeak-ng.lib; 20 espeak-ng.lib;