diff --git a/.travis.yml b/.travis.yml index 013e42628..bdb054bbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -117,6 +117,38 @@ matrix: - BEFORE_BUILD="wget https://sdk.lunarg.com/sdk/download/1.1.92.1/linux/vulkansdk-linux-x86_64-1.1.92.1.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.92.1.tar.gz && tar -xf vulkansdk-linux-x86_64-1.1.92.1.tar.gz && wget https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip && unzip -q android-ndk-r19c-linux-x86_64.zip" - BUILD="export PATH=`pwd`/1.1.92.1/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`pwd`/android-ndk-r19c/build/cmake/android.toolchain.cmake -DANDROID_ABI=\"arm64-v8a\" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON .. && make -j2" + - name: "android-x86" + os: linux + dist: xenial + env: + - NAME=android-x86 + - BEFORE_BUILD="wget https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip && unzip -q android-ndk-r19c-linux-x86_64.zip" + - BUILD="mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`pwd`/android-ndk-r19c/build/cmake/android.toolchain.cmake -DANDROID_ABI=\"x86\" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-14 .. && make -j2" + + - name: "android-x86-gpu" + os: linux + dist: xenial + env: + - NAME=android-x86-gpu + - BEFORE_BUILD="wget https://sdk.lunarg.com/sdk/download/1.1.92.1/linux/vulkansdk-linux-x86_64-1.1.92.1.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.92.1.tar.gz && tar -xf vulkansdk-linux-x86_64-1.1.92.1.tar.gz && wget https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip && unzip -q android-ndk-r19c-linux-x86_64.zip" + - BUILD="export PATH=`pwd`/1.1.92.1/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`pwd`/android-ndk-r19c/build/cmake/android.toolchain.cmake -DANDROID_ABI=\"x86\" -DANDROID_ARM_NEON=ON -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON .. && make -j2" + + - name: "android-x86_64" + os: linux + dist: xenial + env: + - NAME=android-x86_64 + - BEFORE_BUILD="wget https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip && unzip -q android-ndk-r19c-linux-x86_64.zip" + - BUILD="mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`pwd`/android-ndk-r19c/build/cmake/android.toolchain.cmake -DANDROID_ABI=\"x86_64\" -DANDROID_PLATFORM=android-21 .. && make -j2" + + - name: "android-x86_64-gpu" + os: linux + dist: xenial + env: + - NAME=android-x86_64-gpu + - BEFORE_BUILD="wget https://sdk.lunarg.com/sdk/download/1.1.92.1/linux/vulkansdk-linux-x86_64-1.1.92.1.tar.gz?Human=true -O vulkansdk-linux-x86_64-1.1.92.1.tar.gz && tar -xf vulkansdk-linux-x86_64-1.1.92.1.tar.gz && wget https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip && unzip -q android-ndk-r19c-linux-x86_64.zip" + - BUILD="export PATH=`pwd`/1.1.92.1/x86_64/bin:$PATH && mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=`pwd`/android-ndk-r19c/build/cmake/android.toolchain.cmake -DANDROID_ABI=\"x86_64\" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON .. && make -j2" + - name: "ios-iphoneos" os: osx osx_image: xcode9.4 diff --git a/build.sh b/build.sh index 512c79bce..38354f2cc 100755 --- a/build.sh +++ b/build.sh @@ -24,6 +24,22 @@ make make install popd +##### android x86 +mkdir -p build-android-x86 +pushd build-android-x86 +cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="x86" -DANDROID_PLATFORM=android-19 .. +make +make install +popd + +##### android x86_64 +mkdir -p build-android-x86_64 +pushd build-android-x86_64 +cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="x86_64" -DANDROID_PLATFORM=android-21 .. +make +make install +popd + ##### android armv7 vulkan mkdir -p build-android-armv7-vulkan pushd build-android-armv7-vulkan @@ -40,6 +56,22 @@ make make install popd +##### android x86 vulkan +mkdir -p build-android-x86-vulkan +pushd build-android-x86-vulkan +cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="x86" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON .. +make +make install +popd + +##### android x86_64 vulkan +mkdir -p build-android-x86_64-vulkan +pushd build-android-x86_64-vulkan +cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake -DANDROID_ABI="x86_64" -DANDROID_PLATFORM=android-24 -DNCNN_VULKAN=ON .. +make +make install +popd + ##### linux of hisiv300 (forgot the chip name) toolchain with neon and openmp mkdir -p build-hisiv300-linux pushd build-hisiv300-linux