Support onnxruntime 1.18.0 (#906)

2024-07-10 17:05:26 +08:00
parent 9e446b8501
commit dd0ff2ca06
107 changed files with 644 additions and 601 deletions
--- a/build-ios.sh
+++ b/build-ios.sh
@@ -5,7 +5,7 @@ set -e
 dir=build-ios
 mkdir -p $dir
 cd $dir
-onnxruntime_version=1.17.1
+onnxruntime_version=1.18.0
 onnxruntime_dir=ios-onnxruntime/$onnxruntime_version

 SHERPA_ONNX_GITHUB=github.com
@@ -39,91 +39,96 @@ echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
 # The symbol _NSLog is not defined
 #

-cmake \
-  -DBUILD_PIPER_PHONMIZE_EXE=OFF \
-  -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-  -DBUILD_ESPEAK_NG_EXE=OFF \
-  -DBUILD_ESPEAK_NG_TESTS=OFF \
-  -S .. \
-  -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-  -DPLATFORM=SIMULATOR64 \
-  -DENABLE_BITCODE=0 \
-  -DENABLE_ARC=1 \
-  -DENABLE_VISIBILITY=0 \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DBUILD_SHARED_LIBS=OFF \
-  -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-  -DSHERPA_ONNX_ENABLE_TESTS=OFF \
-  -DSHERPA_ONNX_ENABLE_CHECK=OFF \
-  -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-  -DSHERPA_ONNX_ENABLE_JNI=OFF \
-  -DSHERPA_ONNX_ENABLE_C_API=ON \
-  -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-  -DDEPLOYMENT_TARGET=13.0 \
-  -B build/simulator_x86_64
+if [[ ! -f ./build/simulator_x86_64/lib/libsherpa-onnx-c-api.a ]]; then
+  cmake \
+    -DBUILD_PIPER_PHONMIZE_EXE=OFF \
+    -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
+    -DBUILD_ESPEAK_NG_EXE=OFF \
+    -DBUILD_ESPEAK_NG_TESTS=OFF \
+    -S .. \
+    -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
+    -DPLATFORM=SIMULATOR64 \
+    -DENABLE_BITCODE=0 \
+    -DENABLE_ARC=1 \
+    -DENABLE_VISIBILITY=0 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
+    -DSHERPA_ONNX_ENABLE_TESTS=OFF \
+    -DSHERPA_ONNX_ENABLE_CHECK=OFF \
+    -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
+    -DSHERPA_ONNX_ENABLE_JNI=OFF \
+    -DSHERPA_ONNX_ENABLE_C_API=ON \
+    -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
+    -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 --verbose
+fi

 echo "Building for simulator (arm64)"

-cmake \
-  -DBUILD_PIPER_PHONMIZE_EXE=OFF \
-  -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-  -DBUILD_ESPEAK_NG_EXE=OFF \
-  -DBUILD_ESPEAK_NG_TESTS=OFF \
-  -S .. \
-  -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-  -DPLATFORM=SIMULATORARM64 \
-  -DENABLE_BITCODE=0 \
-  -DENABLE_ARC=1 \
-  -DENABLE_VISIBILITY=0 \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DCMAKE_INSTALL_PREFIX=./install \
-  -DBUILD_SHARED_LIBS=OFF \
-  -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-  -DSHERPA_ONNX_ENABLE_TESTS=OFF \
-  -DSHERPA_ONNX_ENABLE_CHECK=OFF \
-  -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-  -DSHERPA_ONNX_ENABLE_JNI=OFF \
-  -DSHERPA_ONNX_ENABLE_C_API=ON \
-  -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-  -DDEPLOYMENT_TARGET=13.0 \
-  -B build/simulator_arm64
+if [[ ! -f ./build/simulator_arm64/lib/libsherpa-onnx-c-api.a ]]; then
+  cmake \
+    -DBUILD_PIPER_PHONMIZE_EXE=OFF \
+    -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
+    -DBUILD_ESPEAK_NG_EXE=OFF \
+    -DBUILD_ESPEAK_NG_TESTS=OFF \
+    -S .. \
+    -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
+    -DPLATFORM=SIMULATORARM64 \
+    -DENABLE_BITCODE=0 \
+    -DENABLE_ARC=1 \
+    -DENABLE_VISIBILITY=0 \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=./install \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
+    -DSHERPA_ONNX_ENABLE_TESTS=OFF \
+    -DSHERPA_ONNX_ENABLE_CHECK=OFF \
+    -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
+    -DSHERPA_ONNX_ENABLE_JNI=OFF \
+    -DSHERPA_ONNX_ENABLE_C_API=ON \
+    -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
+    -DDEPLOYMENT_TARGET=13.0 \
+    -B build/simulator_arm64

-cmake --build build/simulator_arm64 -j 4 --verbose
+  cmake --build build/simulator_arm64 -j 4 --verbose
+fi

 echo "Building for arm64"

 export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/ios-onnxruntime/onnxruntime.xcframework/ios-arm64

+if [[ ! -f ./build/os64/lib/libsherpa-onnx-c-api.a ]]; then
+  cmake \
+    -DBUILD_PIPER_PHONMIZE_EXE=OFF \
+    -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
+    -DBUILD_ESPEAK_NG_EXE=OFF \
+    -DBUILD_ESPEAK_NG_TESTS=OFF \
+    -S .. \
+    -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
+    -DPLATFORM=OS64 \
+    -DENABLE_BITCODE=0 \
+    -DENABLE_ARC=1 \
+    -DENABLE_VISIBILITY=0 \
+    -DCMAKE_INSTALL_PREFIX=./install \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=OFF \
+    -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
+    -DSHERPA_ONNX_ENABLE_TESTS=OFF \
+    -DSHERPA_ONNX_ENABLE_CHECK=OFF \
+    -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
+    -DSHERPA_ONNX_ENABLE_JNI=OFF \
+    -DSHERPA_ONNX_ENABLE_C_API=ON \
+    -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
+    -DDEPLOYMENT_TARGET=13.0 \
+    -B build/os64

-cmake \
-  -DBUILD_PIPER_PHONMIZE_EXE=OFF \
-  -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-  -DBUILD_ESPEAK_NG_EXE=OFF \
-  -DBUILD_ESPEAK_NG_TESTS=OFF \
-  -S .. \
-  -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-  -DPLATFORM=OS64 \
-  -DENABLE_BITCODE=0 \
-  -DENABLE_ARC=1 \
-  -DENABLE_VISIBILITY=0 \
-  -DCMAKE_INSTALL_PREFIX=./install \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DBUILD_SHARED_LIBS=OFF \
-  -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-  -DSHERPA_ONNX_ENABLE_TESTS=OFF \
-  -DSHERPA_ONNX_ENABLE_CHECK=OFF \
-  -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-  -DSHERPA_ONNX_ENABLE_JNI=OFF \
-  -DSHERPA_ONNX_ENABLE_C_API=ON \
-  -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-  -DDEPLOYMENT_TARGET=13.0 \
-  -B build/os64
-
-cmake --build build/os64 -j 4
-# Generate headers for sherpa-onnx.xcframework
-cmake --build build/os64 --target install
+  cmake --build build/os64 -j 4
+  # Generate headers for sherpa-onnx.xcframework
+  cmake --build build/os64 --target install
+fi

 echo "Generate xcframework"

@@ -165,7 +170,6 @@ libtool -static -o build/os64/sherpa-onnx.a \
  build/os64/lib/libespeak-ng.a \
  build/os64/lib/libssentencepiece_core.a

-
 rm -rf sherpa-onnx.xcframework

 xcodebuild -create-xcframework \