Skip to content

Commit

Permalink
Add android-riscv64 build to workflows
Browse files Browse the repository at this point in the history
The Android NDK supports building for RISC-V as of version r27. Add it
to the build workflows here to improve coverage of the RISC-V code.

Fixes: pytorch#206
  • Loading branch information
prashanthswami committed Aug 19, 2024
1 parent 16bfc16 commit 7f556cc
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
cmake-android:
strategy:
matrix:
script: [android-arm64-build.sh, android-armv7-build.sh, android-x86-build.sh]
script: [android-arm64-build.sh, android-armv7-build.sh, android-riscv64-build.sh, android-x86-build.sh]
runs-on: ubuntu-latest
timeout-minutes: 40
steps:
Expand All @@ -86,7 +86,7 @@ jobs:
id: setup-ndk
uses: nttld/[email protected]
with:
ndk-version: r23b
ndk-version: r27
add-to-path: false
- name: Configure and build
run: scripts/${{ matrix.script }}
Expand Down
59 changes: 59 additions & 0 deletions scripts/android-riscv64-build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/usr/bin/env bash

set -e

if [ -z "$ANDROID_NDK" ]
then
echo "ANDROID_NDK not set; please set it to the Android NDK directory"
exit 1
fi

if [ ! -d "$ANDROID_NDK" ]
then
echo "ANDROID_NDK not a directory; did you install it under ${ANDROID_NDK}?"
exit 1
fi

mkdir -p build/android/riscv64

CMAKE_ARGS=()

# CMake-level configuration
CMAKE_ARGS+=("-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake")
CMAKE_ARGS+=("-DCMAKE_BUILD_TYPE=Release")
CMAKE_ARGS+=("-DCMAKE_POSITION_INDEPENDENT_CODE=ON")

# If Ninja is installed, prefer it to Make
if [ -x "$(command -v ninja)" ]
then
CMAKE_ARGS+=("-GNinja")
fi

CMAKE_ARGS+=("-DCPUINFO_LIBRARY_TYPE=static")
# CMakeLists for Google Benchmark is broken on Android
CMAKE_ARGS+=("-DCPUINFO_BUILD_BENCHMARKS=OFF")
CMAKE_ARGS+=("-DCPUINFO_BUILD_TOOLS=ON")
CMAKE_ARGS+=("-DCPUINFO_BUILD_UNIT_TESTS=ON")
CMAKE_ARGS+=("-DCPUINFO_BUILD_MOCK_TESTS=ON")

# Android-specific options
CMAKE_ARGS+=("-DANDROID_NDK=$ANDROID_NDK")
CMAKE_ARGS+=("-DANDROID_ABI=riscv64")
CMAKE_ARGS+=("-DANDROID_PLATFORM=android-35")
CMAKE_ARGS+=("-DANDROID_PIE=ON")
CMAKE_ARGS+=("-DANDROID_STL=c++_static")
CMAKE_ARGS+=("-DANDROID_CPP_FEATURES=exceptions")

# Use-specified CMake arguments go last to allow overridding defaults
CMAKE_ARGS+=($@)

cd build/android/riscv64 && cmake ../../.. \
"${CMAKE_ARGS[@]}"

# Cross-platform parallel build
if [ "$(uname)" == "Darwin" ]
then
cmake --build . -- "-j$(sysctl -n hw.ncpu)"
else
cmake --build . -- "-j$(nproc)"
fi

0 comments on commit 7f556cc

Please sign in to comment.