修复Android NDK编译

ztxz16 · Jun 10, 2024 · 44a1db6 · 44a1db6
1 parent ec8a311
commit 44a1db6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -16,9 +16,9 @@ jobs:
 
     - name: Build with arm64-v8a
       run: |
-        wget https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip
-        unzip android-ndk-r21d-linux-x86_64.zip
-        export NDK=$GITHUB_WORKSPACE/android-ndk-r21d
+        wget -q https://dl.google.com/android/repository/android-ndk-r22b-linux-x86_64.zip
+        unzip android-ndk-r22b-linux-x86_64.zip
+        export NDK=$GITHUB_WORKSPACE/android-ndk-r22b
         mkdir build-android
         cd build-android
         #ls ${NDK}/build/cmake/android.toolchain.cmake
@@ -35,7 +35,7 @@ jobs:
         cp main fastllm-main-x86_64
         
     - name: Export and Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Output
         path: |

diff --git a/example/Android/LLMAssistant/app/src/main/cpp/CMakeLists.txt b/example/Android/LLMAssistant/app/src/main/cpp/CMakeLists.txt
@@ -30,15 +30,20 @@ set(PROJECT_SOURCE
         ../../../../../../../src/device.cpp
         ../../../../../../../src/model.cpp
         ../../../../../../../src/executor.cpp
+        ../../../../../../../src/template.cpp
         ../../../../../../../src/devices/cpu/cpudevice.cpp
         ../../../../../../../src/devices/cpu/cpudevicebatch.cpp
         ../../../../../../../src/models/basellm.cpp
+        ../../../../../../../src/models/bert.cpp
         ../../../../../../../src/models/chatglm.cpp
+        ../../../../../../../src/models/deepseekv2.cpp
         ../../../../../../../src/models/moss.cpp
         ../../../../../../../src/models/llama.cpp
         ../../../../../../../src/models/qwen.cpp
         ../../../../../../../src/models/glm.cpp
+        ../../../../../../../src/models/internlm2.cpp
         ../../../../../../../src/models/minicpm.cpp
+        ../../../../../../../src/models/moe.cpp
         )
 
 include_directories(