Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build for android 16k pagesize by default, update android api 21 #5833

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

build for android 16k pagesize by default, update android api 21 #5833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ jobs:
NCNN_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
-DANDROID_PLATFORM=android-21 \
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
-DCMAKE_INSTALL_PREFIX=install \
-DCMAKE_BUILD_TYPE=Release \
-DNCNN_VULKAN=ON \
Expand Down
18 changes: 13 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1916,14 +1916,15 @@ jobs:
PACKAGENAME: ncnn-${{ needs.setup.outputs.VERSION }}-${{ matrix.opt.id }}
NCNN_CMAKE_OPTIONS: |
-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_LATEST_HOME/build/cmake/android.toolchain.cmake \
-DANDROID_PLATFORM=android-21 \
-DANDROID_USE_LEGACY_TOOLCHAIN_FILE=False \
-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=install \
-DNCNN_VERSION_STRING="${{ needs.setup.outputs.VERSION }}" \
-DNCNN_BUILD_BENCHMARK=OFF \
-DNCNN_VULKAN=${{ matrix.opt.vulkan }} \
-DNCNN_SHARED_LIB=${{ matrix.opt.shared-lib }} \
-DNCNN_AVX512BF16=OFF \

steps:
- uses: actions/checkout@v4
Expand All @@ -1934,25 +1935,31 @@ jobs:
- name: build-armeabi-v7a
run: |
mkdir build-armeabi-v7a && cd build-armeabi-v7a
cmake ${{ env.NCNN_CMAKE_OPTIONS }} -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-14 ..
cmake ${{ env.NCNN_CMAKE_OPTIONS }} -DANDROID_ABI="armeabi-v7a" -DANDROID_ARM_NEON=ON ..
cmake --build . -j $(nproc)
cmake --build . --target install/strip
- name: build-arm64-v8a
run: |
mkdir build-arm64-v8a && cd build-arm64-v8a
cmake ${{ env.NCNN_CMAKE_OPTIONS }}-DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-21 ..
cmake ${{ env.NCNN_CMAKE_OPTIONS }}-DANDROID_ABI="arm64-v8a" ..
cmake --build . -j $(nproc)
cmake --build . --target install/strip
- name: build-x86
run: |
mkdir build-x86 && cd build-x86
cmake ${{ env.NCNN_CMAKE_OPTIONS }}-DANDROID_ABI="x86" -DANDROID_PLATFORM=android-14 ..
cmake ${{ env.NCNN_CMAKE_OPTIONS }}-DANDROID_ABI="x86" ..
cmake --build . -j $(nproc)
cmake --build . --target install/strip
- name: build-x86_64
run: |
mkdir build-x86_64 && cd build-x86_64
cmake ${{ env.NCNN_CMAKE_OPTIONS }}-DANDROID_ABI="x86_64" -DANDROID_PLATFORM=android-21 ..
cmake ${{ env.NCNN_CMAKE_OPTIONS }}-DANDROID_ABI="x86_64" ..
cmake --build . -j $(nproc)
cmake --build . --target install/strip
- name: build-riscv64
run: |
mkdir build-riscv64 && cd build-riscv64
cmake ${{ env.NCNN_CMAKE_OPTIONS }}-DANDROID_ABI="riscv64" ..
cmake --build . -j $(nproc)
cmake --build . --target install/strip
- name: package
Expand All @@ -1963,6 +1970,7 @@ jobs:
cp -a build-arm64-v8a/install ${{ env.PACKAGENAME }}/arm64-v8a
cp -a build-x86/install ${{ env.PACKAGENAME }}/x86
cp -a build-x86_64/install ${{ env.PACKAGENAME }}/x86_64
cp -a build-riscv64/install ${{ env.PACKAGENAME }}/riscv64
rm -f ${{ env.PACKAGENAME }}.zip
zip -9 -y -r ${{ env.PACKAGENAME }}.zip ${{ env.PACKAGENAME }}
- name: upload-zip
Expand Down
Loading