diff --git a/build-android-arm64-v8a.sh b/build-android-arm64-v8a.sh index 0599748b..c6778380 100755 --- a/build-android-arm64-v8a.sh +++ b/build-android-arm64-v8a.sh @@ -42,31 +42,19 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -onnxruntime_version=v1.17.0 +onnxruntime_version=1.17.0 -if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then - if [ ! -d android-onnxruntime-libs ]; then - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs - fi - pushd android-onnxruntime-libs - git lfs pull --include "$onnxruntime_version/jni/arm64-v8a/libonnxruntime.so" - ln -s $onnxruntime_version/jni . - ln -s $onnxruntime_version/headers . +if [ ! -f $onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then + mkdir -p $onnxruntime_version + pushd $onnxruntime_version + wget -q https://github.com/csukuangfj/onnxruntime-libs/releases/download/v${onnxruntime_version}/onnxruntime-android-${onnxruntime_version}.zip + unzip onnxruntime-android-${onnxruntime_version}.zip + rm onnxruntime-android-${onnxruntime_version}.zip popd fi -ls -lh ./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) -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=$dir/android-onnxruntime-libs/jni/arm64-v8a/ -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/$onnxruntime_version/jni/arm64-v8a/ +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/$onnxruntime_version/headers/ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" @@ -91,5 +79,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" # make VERBOSE=1 -j4 make -j4 make install/strip -cp -fv android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so install/lib +cp -fv $onnxruntime_version/jni/arm64-v8a/libonnxruntime.so install/lib rm -rf install/lib/pkgconfig diff --git a/build-android-armv7-eabi.sh b/build-android-armv7-eabi.sh index d712b1ff..4b401092 100755 --- a/build-android-armv7-eabi.sh +++ b/build-android-armv7-eabi.sh @@ -43,31 +43,19 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -onnxruntime_version=v1.17.0 +onnxruntime_version=1.17.0 -if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then - if [ ! -d android-onnxruntime-libs ]; then - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs - fi - pushd android-onnxruntime-libs - git lfs pull --include "$onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so" - ln -s $onnxruntime_version/jni . - ln -s $onnxruntime_version/headers . +if [ ! -f $onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then + mkdir -p $onnxruntime_version + pushd $onnxruntime_version + wget -q https://github.com/csukuangfj/onnxruntime-libs/releases/download/v${onnxruntime_version}/onnxruntime-android-${onnxruntime_version}.zip + unzip onnxruntime-android-${onnxruntime_version}.zip + rm onnxruntime-android-${onnxruntime_version}.zip 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/ +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/$onnxruntime_version/jni/armeabi-v7a/ +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/$onnxruntime_version/headers/ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" @@ -91,5 +79,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" # make VERBOSE=1 -j4 make -j4 make install/strip -cp -fv android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so install/lib +cp -fv $onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so install/lib rm -rf install/lib/pkgconfig diff --git a/build-android-x86-64.sh b/build-android-x86-64.sh index 0711805a..7304a910 100755 --- a/build-android-x86-64.sh +++ b/build-android-x86-64.sh @@ -43,31 +43,19 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -onnxruntime_version=v1.17.0 +onnxruntime_version=1.17.0 -if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then - if [ ! -d android-onnxruntime-libs ]; then - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs - fi - pushd android-onnxruntime-libs - git lfs pull --include "$onnxruntime_version/jni/x86_64/libonnxruntime.so" - ln -s $onnxruntime_version/jni . - ln -s $onnxruntime_version/headers . +if [ ! -f $onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then + mkdir -p $onnxruntime_version + pushd $onnxruntime_version + wget -q https://github.com/csukuangfj/onnxruntime-libs/releases/download/v${onnxruntime_version}/onnxruntime-android-${onnxruntime_version}.zip + unzip onnxruntime-android-${onnxruntime_version}.zip + rm onnxruntime-android-${onnxruntime_version}.zip popd fi -ls -l ./android-onnxruntime-libs/jni/x86_64/libonnxruntime.so - -# check filesize -filesize=$(ls -l ./android-onnxruntime-libs/jni/x86_64/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5) -if (( $filesize < 1000 )); then - ls -lh ./android-onnxruntime-libs/jni/x86_64/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/x86_64/ -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/$onnxruntime_version/jni/x86_64/ +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/$onnxruntime_version/headers/ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" @@ -93,5 +81,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" # make VERBOSE=1 -j4 make -j4 make install/strip -cp -fv android-onnxruntime-libs/jni/x86_64/libonnxruntime.so install/lib +cp -fv $onnxruntime_version/jni/x86_64/libonnxruntime.so install/lib rm -rf install/lib/pkgconfig diff --git a/build-android-x86.sh b/build-android-x86.sh index 281675d7..3f5d291b 100755 --- a/build-android-x86.sh +++ b/build-android-x86.sh @@ -43,31 +43,19 @@ fi echo "ANDROID_NDK: $ANDROID_NDK" sleep 1 -onnxruntime_version=v1.17.0 +onnxruntime_version=1.17.0 -if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86/libonnxruntime.so ]; then - if [ ! -d android-onnxruntime-libs ]; then - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs - fi - pushd android-onnxruntime-libs - git lfs pull --include "$onnxruntime_version/jni/x86/libonnxruntime.so" - ln -s $onnxruntime_version/jni . - ln -s $onnxruntime_version/headers . +if [ ! -f $onnxruntime_version/jni/x86/libonnxruntime.so ]; then + mkdir -p $onnxruntime_version + pushd $onnxruntime_version + wget -q https://github.com/csukuangfj/onnxruntime-libs/releases/download/v${onnxruntime_version}/onnxruntime-android-${onnxruntime_version}.zip + unzip onnxruntime-android-${onnxruntime_version}.zip + rm onnxruntime-android-${onnxruntime_version}.zip popd fi -ls -l ./android-onnxruntime-libs/jni/x86/libonnxruntime.so - -# check filesize -filesize=$(ls -l ./android-onnxruntime-libs/jni/x86/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5) -if (( $filesize < 1000 )); then - ls -lh ./android-onnxruntime-libs/jni/x86/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/x86/ -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/$onnxruntime_version/jni/x86/ +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/$onnxruntime_version/headers/ echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" @@ -93,5 +81,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" # make VERBOSE=1 -j4 make -j4 make install/strip -cp -fv android-onnxruntime-libs/jni/x86/libonnxruntime.so install/lib +cp -fv $onnxruntime_version/jni/x86/libonnxruntime.so install/lib rm -rf install/lib/pkgconfig