diff --git a/.gitignore b/.gitignore index 1cdb6323..bded3d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ sherpa-onnx-streaming-zipformer-* sherpa-onnx-lstm-en-* sherpa-onnx-lstm-zh-* build-android-arm64-v8a/ +build-android-armv7-eabi/ build-android-x86-64/ a.txt run-bilingual*.sh @@ -35,3 +36,4 @@ tokens.txt *.onnx log.txt tags +android/SherpaOnnx/app/src/main/assets/ diff --git a/build-android-arm64-v8a.sh b/build-android-arm64-v8a.sh index 64974bbe..671c3942 100755 --- a/build-android-arm64-v8a.sh +++ b/build-android-arm64-v8a.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -ex -dir=build-android-arm64-v8a +dir=$PWD/build-android-arm64-v8a mkdir -p $dir cd $dir @@ -43,7 +43,7 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -if [ ! -f android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so ]; then +if [ ! -f ./android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so ]; then GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs pushd android-onnxruntime-libs git lfs pull --include "jni/arm64-v8a/libonnxruntime.so" @@ -53,15 +53,15 @@ fi ls -l ./android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so # check filesize -filesize=$(ls -l ./android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5) +filesize=$(ls -l ./android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5) if (( $filesize < 1000 )); then ls -lh ./android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so echo "Please use: git lfs pull to download libonnxruntime.so" exit 1 fi -export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/android-onnxruntime-libs/jni/arm64-v8a/ -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$PWD/android-onnxruntime-libs/headers/ +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/android-onnxruntime-libs/jni/arm64-v8a/ +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" diff --git a/build-android-armv7-eabi.sh b/build-android-armv7-eabi.sh new file mode 100755 index 00000000..0e981979 --- /dev/null +++ b/build-android-armv7-eabi.sh @@ -0,0 +1,83 @@ +#!/usr/bin/env bash +set -ex + +dir=$PWD/build-android-armv7-eabi + +mkdir -p $dir +cd $dir + +# Note from https://github.com/Tencent/ncnn/wiki/how-to-build#build-for-android +# (optional) remove the hardcoded debug flag in Android NDK android-ndk +# issue: https://github.com/android/ndk/issues/243 +# +# open $ANDROID_NDK/build/cmake/android.toolchain.cmake for ndk < r23 +# or $ANDROID_NDK/build/cmake/android-legacy.toolchain.cmake for ndk >= r23 +# +# delete "-g" line +# +# list(APPEND ANDROID_COMPILER_FLAGS +# -g +# -DANDROID + +if [ -z $ANDROID_NDK ]; then + ANDROID_NDK=/ceph-fj/fangjun/software/android-sdk/ndk/21.0.6113669 + # or use + # ANDROID_NDK=/ceph-fj/fangjun/software/android-ndk + # + # Inside the $ANDROID_NDK directory, you can find a binary ndk-build + # and some other files like the file "build/cmake/android.toolchain.cmake" + + if [ ! -d $ANDROID_NDK ]; then + # For macOS, I have installed Android Studio, select the menu + # Tools -> SDK manager -> Android SDK + # and set "Android SDK location" to /Users/fangjun/software/my-android + ANDROID_NDK=/Users/fangjun/software/my-android/ndk/22.1.7171670 + fi +fi + +if [ ! -d $ANDROID_NDK ]; then + echo Please set the environment variable ANDROID_NDK before you run this script + exit 1 +fi + +echo "ANDROID_NDK: $ANDROID_NDK" +sleep 1 + +if [ ! -f ./android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so ]; then + GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs + pushd android-onnxruntime-libs + git lfs pull --include "jni/armeabi-v7a/libonnxruntime.so" + popd +fi + +ls -l ./android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so + +# check filesize +filesize=$(ls -l ./android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5) +if (( $filesize < 1000 )); then + ls -lh ./android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so + echo "Please use: git lfs pull to download libonnxruntime.so" + exit 1 +fi + +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/android-onnxruntime-libs/jni/armeabi-v7a/ +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ + +echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" +echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" + +cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON \ + -DSHERPA_ONNX_ENABLE_PYTHON=OFF \ + -DSHERPA_ONNX_ENABLE_TESTS=OFF \ + -DSHERPA_ONNX_ENABLE_CHECK=OFF \ + -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \ + -DSHERPA_ONNX_ENABLE_JNI=ON \ + -DCMAKE_INSTALL_PREFIX=./install \ + -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON \ + -DANDROID_PLATFORM=android-21 .. +# make VERBOSE=1 -j4 +make -j4 +make install/strip +cp -fv android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so install/lib diff --git a/build-android-x86-64.sh b/build-android-x86-64.sh index e97a189b..9749cef6 100755 --- a/build-android-x86-64.sh +++ b/build-android-x86-64.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -ex -dir=build-android-x86-64 +dir=$PWD/build-android-x86-64 mkdir -p $dir cd $dir @@ -43,7 +43,7 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -if [ ! -f android-onnxruntime-libs/jni/x86_64/libonnxruntime.so ]; then +if [ ! -f ./android-onnxruntime-libs/jni/x86_64/libonnxruntime.so ]; then GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs pushd android-onnxruntime-libs git lfs pull --include "jni/x86_64/libonnxruntime.so" @@ -60,8 +60,8 @@ if (( $filesize < 1000 )); then exit 1 fi -export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/android-onnxruntime-libs/jni/x86_64/ -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$PWD/android-onnxruntime-libs/headers/ +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/android-onnxruntime-libs/jni/x86_64/ +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"