xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
2ab1fa02 1 parent 92a8fd64

Download android onnxruntime libs from github. (#584) 

It does not need to use git lfs any longer.
内嵌 并排对比
正在显示 4 个修改的文件 包含 40 行增加 和 88 行删除
@@ -42,31 +42,19 @@ fi @@ -42,31 +42,19 @@ fi
42 42
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 -onnxruntime_version=v1.17.0 45 +onnxruntime_version=1.17.0
46 46
47 -if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then  
48 - if [ ! -d android-onnxruntime-libs ]; then  
49 - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs  
50 - fi  
51 - pushd android-onnxruntime-libs  
52 - git lfs pull --include "$onnxruntime_version/jni/arm64-v8a/libonnxruntime.so"  
53 - ln -s $onnxruntime_version/jni .  
54 - ln -s $onnxruntime_version/headers . 47 +if [ ! -f $onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then
  48 + mkdir -p $onnxruntime_version
  49 + pushd $onnxruntime_version
  50 + wget -q https://github.com/csukuangfj/onnxruntime-libs/releases/download/v${onnxruntime_version}/onnxruntime-android-${onnxruntime_version}.zip
  51 + unzip onnxruntime-android-${onnxruntime_version}.zip
  52 + rm onnxruntime-android-${onnxruntime_version}.zip
55 popd 53 popd
56 fi 54 fi
57 55
58 -ls -lh ./android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so  
59 -  
60 -# check filesize  
61 -filesize=$(ls -l ./android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5)  
62 -if (( $filesize < 1000 )); then  
63 - ls -lh ./android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so  
64 - echo "Please use: git lfs pull to download libonnxruntime.so"  
65 - exit 1  
66 -fi  
67 -  
68 -export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/android-onnxruntime-libs/jni/arm64-v8a/  
69 -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ 56 +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/$onnxruntime_version/jni/arm64-v8a/
  57 +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/$onnxruntime_version/headers/
70 58
71 echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" 59 echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR"
72 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" 60 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
@@ -91,5 +79,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" @@ -91,5 +79,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
91 # make VERBOSE=1 -j4 79 # make VERBOSE=1 -j4
92 make -j4 80 make -j4
93 make install/strip 81 make install/strip
94 -cp -fv android-onnxruntime-libs/jni/arm64-v8a/libonnxruntime.so install/lib 82 +cp -fv $onnxruntime_version/jni/arm64-v8a/libonnxruntime.so install/lib
95 rm -rf install/lib/pkgconfig 83 rm -rf install/lib/pkgconfig
@@ -43,31 +43,19 @@ fi @@ -43,31 +43,19 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=v1.17.0 46 +onnxruntime_version=1.17.0
47 47
48 -if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then  
49 - if [ ! -d android-onnxruntime-libs ]; then  
50 - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs  
51 - fi  
52 - pushd android-onnxruntime-libs  
53 - git lfs pull --include "$onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so"  
54 - ln -s $onnxruntime_version/jni .  
55 - ln -s $onnxruntime_version/headers . 48 +if [ ! -f $onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then
  49 + mkdir -p $onnxruntime_version
  50 + pushd $onnxruntime_version
  51 + wget -q https://github.com/csukuangfj/onnxruntime-libs/releases/download/v${onnxruntime_version}/onnxruntime-android-${onnxruntime_version}.zip
  52 + unzip onnxruntime-android-${onnxruntime_version}.zip
  53 + rm onnxruntime-android-${onnxruntime_version}.zip
56 popd 54 popd
57 fi 55 fi
58 56
59 -ls -l ./android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so  
60 -  
61 -# check filesize  
62 -filesize=$(ls -l ./android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5)  
63 -if (( $filesize < 1000 )); then  
64 - ls -lh ./android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so  
65 - echo "Please use: git lfs pull to download libonnxruntime.so"  
66 - exit 1  
67 -fi  
68 -  
69 -export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/android-onnxruntime-libs/jni/armeabi-v7a/  
70 -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ 57 +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/$onnxruntime_version/jni/armeabi-v7a/
  58 +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/$onnxruntime_version/headers/
71 59
72 echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" 60 echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR"
73 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" 61 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
@@ -91,5 +79,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" @@ -91,5 +79,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
91 # make VERBOSE=1 -j4 79 # make VERBOSE=1 -j4
92 make -j4 80 make -j4
93 make install/strip 81 make install/strip
94 -cp -fv android-onnxruntime-libs/jni/armeabi-v7a/libonnxruntime.so install/lib 82 +cp -fv $onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so install/lib
95 rm -rf install/lib/pkgconfig 83 rm -rf install/lib/pkgconfig
@@ -43,31 +43,19 @@ fi @@ -43,31 +43,19 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=v1.17.0 46 +onnxruntime_version=1.17.0
47 47
48 -if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then  
49 - if [ ! -d android-onnxruntime-libs ]; then  
50 - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs  
51 - fi  
52 - pushd android-onnxruntime-libs  
53 - git lfs pull --include "$onnxruntime_version/jni/x86_64/libonnxruntime.so"  
54 - ln -s $onnxruntime_version/jni .  
55 - ln -s $onnxruntime_version/headers . 48 +if [ ! -f $onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then
  49 + mkdir -p $onnxruntime_version
  50 + pushd $onnxruntime_version
  51 + wget -q https://github.com/csukuangfj/onnxruntime-libs/releases/download/v${onnxruntime_version}/onnxruntime-android-${onnxruntime_version}.zip
  52 + unzip onnxruntime-android-${onnxruntime_version}.zip
  53 + rm onnxruntime-android-${onnxruntime_version}.zip
56 popd 54 popd
57 fi 55 fi
58 56
59 -ls -l ./android-onnxruntime-libs/jni/x86_64/libonnxruntime.so  
60 -  
61 -# check filesize  
62 -filesize=$(ls -l ./android-onnxruntime-libs/jni/x86_64/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5)  
63 -if (( $filesize < 1000 )); then  
64 - ls -lh ./android-onnxruntime-libs/jni/x86_64/libonnxruntime.so  
65 - echo "Please use: git lfs pull to download libonnxruntime.so"  
66 - exit 1  
67 -fi  
68 -  
69 -export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/android-onnxruntime-libs/jni/x86_64/  
70 -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ 57 +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/$onnxruntime_version/jni/x86_64/
  58 +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/$onnxruntime_version/headers/
71 59
72 echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" 60 echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR"
73 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" 61 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
@@ -93,5 +81,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" @@ -93,5 +81,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
93 # make VERBOSE=1 -j4 81 # make VERBOSE=1 -j4
94 make -j4 82 make -j4
95 make install/strip 83 make install/strip
96 -cp -fv android-onnxruntime-libs/jni/x86_64/libonnxruntime.so install/lib 84 +cp -fv $onnxruntime_version/jni/x86_64/libonnxruntime.so install/lib
97 rm -rf install/lib/pkgconfig 85 rm -rf install/lib/pkgconfig
@@ -43,31 +43,19 @@ fi @@ -43,31 +43,19 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=v1.17.0 46 +onnxruntime_version=1.17.0
47 47
48 -if [ ! -f ./android-onnxruntime-libs/$onnxruntime_version/jni/x86/libonnxruntime.so ]; then  
49 - if [ ! -d android-onnxruntime-libs ]; then  
50 - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/android-onnxruntime-libs  
51 - fi  
52 - pushd android-onnxruntime-libs  
53 - git lfs pull --include "$onnxruntime_version/jni/x86/libonnxruntime.so"  
54 - ln -s $onnxruntime_version/jni .  
55 - ln -s $onnxruntime_version/headers . 48 +if [ ! -f $onnxruntime_version/jni/x86/libonnxruntime.so ]; then
  49 + mkdir -p $onnxruntime_version
  50 + pushd $onnxruntime_version
  51 + wget -q https://github.com/csukuangfj/onnxruntime-libs/releases/download/v${onnxruntime_version}/onnxruntime-android-${onnxruntime_version}.zip
  52 + unzip onnxruntime-android-${onnxruntime_version}.zip
  53 + rm onnxruntime-android-${onnxruntime_version}.zip
56 popd 54 popd
57 fi 55 fi
58 56
59 -ls -l ./android-onnxruntime-libs/jni/x86/libonnxruntime.so  
60 -  
61 -# check filesize  
62 -filesize=$(ls -l ./android-onnxruntime-libs/jni/x86/libonnxruntime.so | tr -s " " " " | cut -d " " -f 5)  
63 -if (( $filesize < 1000 )); then  
64 - ls -lh ./android-onnxruntime-libs/jni/x86/libonnxruntime.so  
65 - echo "Please use: git lfs pull to download libonnxruntime.so"  
66 - exit 1  
67 -fi  
68 -  
69 -export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/android-onnxruntime-libs/jni/x86/  
70 -export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/android-onnxruntime-libs/headers/ 57 +export SHERPA_ONNXRUNTIME_LIB_DIR=$dir/$onnxruntime_version/jni/x86/
  58 +export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$dir/$onnxruntime_version/headers/
71 59
72 echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR" 60 echo "SHERPA_ONNXRUNTIME_LIB_DIR: $SHERPA_ONNXRUNTIME_LIB_DIR"
73 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" 61 echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
@@ -93,5 +81,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" @@ -93,5 +81,5 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
93 # make VERBOSE=1 -j4 81 # make VERBOSE=1 -j4
94 make -j4 82 make -j4
95 make install/strip 83 make install/strip
96 -cp -fv android-onnxruntime-libs/jni/x86/libonnxruntime.so install/lib 84 +cp -fv $onnxruntime_version/jni/x86/libonnxruntime.so install/lib
97 rm -rf install/lib/pkgconfig 85 rm -rf install/lib/pkgconfig