frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-20 21:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

tweak scripts/build_android.sh for ABI and header install (#20152)

Browse Source 
Summary:
We now can build libtorch for Android.
This patch aims to provide two improvements to the build
- Make the architecture overridable by providing an environment variable `ANDROID_ABI`.
- Use `--target install` when calling cmake to actually get the header files nicely in one place.

I ran the script without options to see if the caffe2 builds are affected (in particularly by the install), but they seem to run OK and probably only produce a few files in build_android/install.
Pull Request resolved: https://github.com/pytorch/pytorch/pull/20152

Differential Revision: D15249020

Pulled By: pjh5

fbshipit-source-id: bc89f1dcadce36f63dc93f9249cba90a7fc9e93d
This commit is contained in:
Thomas Viehmann
2019-05-07 17:40:54 -07:00
committed by Facebook Github Bot
parent faf2c3ac26
commit 3ac4d92824
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build_android.sh
View File

@ -22,7 +22,9 @@
set -e set -e
# Android specific flags # Android specific flags
ANDROID_ABI="armeabi-v7a with NEON" if [ -z "$ANDROID_ABI" ]; then
ANDROID_ABI="armeabi-v7a with NEON"
fi
ANDROID_NATIVE_API_LEVEL="21" ANDROID_NATIVE_API_LEVEL="21"
echo "Build with ANDROID_ABI[$ANDROID_ABI], ANDROID_NATIVE_API_LEVEL[$ANDROID_NATIVE_API_LEVEL]" echo "Build with ANDROID_ABI[$ANDROID_ABI], ANDROID_NATIVE_API_LEVEL[$ANDROID_NATIVE_API_LEVEL]"
@ -114,9 +116,7 @@ if [ -z "$MAX_JOBS" ]; then
MAX_JOBS=$(nproc) MAX_JOBS=$(nproc)
fi fi
fi fi
cmake --build . -- "-j${MAX_JOBS}"
# copy headers and libs to install directory
echo "Will install headers and libs to $INSTALL_PREFIX for further Android project usage." echo "Will install headers and libs to $INSTALL_PREFIX for further Android project usage."
make install cmake --build . --target install -- "-j${MAX_JOBS}"
echo "Installation completed, now you can copy the headers/libs from $INSTALL_PREFIX to your Android project directory." echo "Installation completed, now you can copy the headers/libs from $INSTALL_PREFIX to your Android project directory."