diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 8d3031d8377..9262d369a88 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -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 \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9351066e4a5..dd26b5d8e9b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 @@ -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