Add demo_android Dockerfile (#1646)

apps/android_deploy/README.md

@@ -2,14 +2,21 @@
 
 This folder contains Android Demo app that allows us to show how to deploy model using TVM runtime api on a Android phone.
 
-You will need [JDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html), [Android SDK](https://developer.android.com/studio/index.html), [Android NDK](https://developer.android.com/ndk) and an Android device to use this.
+You will need [JDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html), [Android SDK](https://developer.android.com/studio/index.html), [Android NDK](https://developer.android.com/ndk) and an Android device to use this. Make sure the `ANDROID_HOME` variable already points to your Android SDK folder or set it using `export ANDROID_HOME=[Path to your Android SDK, e.g., ~/Android/sdk]`. We use [Gradle](https://gradle.org) to build. Please follow [the installation instruction](https://gradle.org/install) for your operating system.
+
+Alternatively, you may execute Docker image we provide wich contains the required packages. Use the command below to build the image and enter interactive session. Note, that building with OpenCL was not tested from Docker.
+
+```bash
+./docker/build.sh demo_android -it bash
+(docker) $ echo $ANDROID_HOME
+(docker) /opt/android-sdk-linux
+```
+
 
 ## Build and Installation
 
 ### Build APK
 
-We use [Gradle](https://gradle.org) to build. Please follow [the installation instruction](https://gradle.org/install) for your operating system.
-
 Before you build the Android application, please refer to [TVM4J Installation Guide](https://github.com/dmlc/tvm/blob/master/jvm/README.md) and install tvm4j-core to your local maven repository. You can find tvm4j dependency declare in `app/build.gradle`. Modify it if it is necessary.
 
 ```
@@ -48,7 +55,6 @@ USE_OPENCL = 0
 Now use Gradle to compile JNI, resolve Java dependencies and build the Android application together with tvm4j. Run following script to generate the apk file.
 
 ```bash
-export ANDROID_HOME=[Path to your Android SDK, e.g., ~/Android/sdk]
 cd apps/android_deploy
 gradle clean build
 ```

apps/android_deploy/build.gradle

@@ -3,9 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
         classpath 'org.apache.httpcomponents:httpclient:4.5.4'
 
         // NOTE: Do not place your application dependencies here; they belong

apps/android_deploy/dev_tools/sign_apk.sh

 #!/bin/bash
 CURR_DIR=$(cd `dirname $0`; pwd)
-APK_DIR=$CURR_DIR/../app/build/outputs/apk
+APK_DIR=$CURR_DIR/../app/build/outputs/apk/release
 UNSIGNED_APK=$APK_DIR/app-release-unsigned.apk
 SIGNED_APK=$APK_DIR/tvmdemo-release.apk
 jarsigner -verbose -keystore $CURR_DIR/tvmdemo.keystore -signedjar $SIGNED_APK $UNSIGNED_APK 'tvmdemo'

apps/android_rpc/build.gradle

@@ -3,9 +3,12 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

apps/android_rpc/dev_tools/sign_apk.sh

 #!/bin/bash
 CURR_DIR=$(cd `dirname $0`; pwd)
-APK_DIR=$CURR_DIR/../app/build/outputs/apk
+APK_DIR=$CURR_DIR/../app/build/outputs/apk/release
 UNSIGNED_APK=$APK_DIR/app-release-unsigned.apk
 SIGNED_APK=$APK_DIR/tvmrpc-release.apk
 jarsigner -verbose -keystore $CURR_DIR/tvmrpc.keystore -signedjar $SIGNED_APK $UNSIGNED_APK 'tvmrpc'

docker/Dockerfile.demo_android

+# Minimum docker image for demo purposes
+FROM ubuntu:16.04
+
+RUN apt-get update --fix-missing
+
+COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
+RUN bash /install/ubuntu_install_core.sh
+
+COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh
+RUN bash /install/ubuntu_install_python.sh
+
+COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh
+RUN bash /install/ubuntu_install_python_package.sh
+
+COPY install/ubuntu_install_keras.sh /install/ubuntu_install_keras.sh
+RUN bash /install/ubuntu_install_keras.sh
+
+COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh
+RUN bash /install/ubuntu_install_java.sh
+
+COPY install/ubuntu_install_llvm.sh /install/ubuntu_install_llvm.sh
+RUN bash /install/ubuntu_install_llvm.sh
+
+COPY install/ubuntu_install_gradle.sh /install/ubuntu_install_gradle.sh
+RUN bash /install/ubuntu_install_gradle.sh
+
+COPY install/ubuntu_install_androidsdk.sh /install/ubuntu_install_androidsdk.sh
+RUN bash /install/ubuntu_install_androidsdk.sh
+
+# Build TVM
+COPY install/install_tvm_cpu.sh /install/install_tvm_cpu.sh
+RUN bash /install/install_tvm_cpu.sh
+
+# Environment variables
+ENV PYTHONPATH=/usr/tvm/python:/usr/tvm/topi/python:/usr/tvm/nnvm/python/:/usr/tvm/vta/python:${PYTHONPATH}
+

docker/bash.sh

@@ -55,5 +55,5 @@ ${DOCKER_BINARY} run --rm --pid=host\
     -e "CI_BUILD_GID=$(id -g)" \
     ${CI_DOCKER_EXTRA_PARAMS[@]} \
     ${DOCKER_IMAGE_NAME}\
-    bash /docker/with_the_same_user \
+    bash --login /docker/with_the_same_user \
     ${COMMAND[@]}

docker/build.sh

@@ -127,5 +127,5 @@ ${DOCKER_BINARY} run --rm --pid=host \
     -e "CI_BUILD_GID=$(id -g)" \
     ${CI_DOCKER_EXTRA_PARAMS[@]} \
     ${DOCKER_IMG_NAME} \
-    bash docker/with_the_same_user \
+    bash --login docker/with_the_same_user \
     ${COMMAND[@]}

docker/install/ubuntu_install_androidsdk.sh

+. /etc/profile
+
+set -o errexit -o nounset
+
+ANDROID_HOME=/opt/android-sdk-linux
+ASDKTOOLS_HOME=/opt/android-sdk-tools
+ASDKTOOLS_VERSION=3859397
+ASDKTOOLS_SHA256=444e22ce8ca0f67353bda4b85175ed3731cae3ffa695ca18119cbacef1c1bea0
+
+wget http://dl.google.com/android/repository/sdk-tools-linux-${ASDKTOOLS_VERSION}.zip -O sdk-tools-linux.zip
+echo "${ASDKTOOLS_SHA256} *sdk-tools-linux.zip" | sha256sum --check -
+unzip sdk-tools-linux.zip
+rm sdk-tools-linux.zip
+mv tools "${ASDKTOOLS_HOME}/"
+# The following popular fix makes sdkmanager honour $http_proxy variables
+mv ${ASDKTOOLS_HOME}/bin/sdkmanager ${ASDKTOOLS_HOME}/bin/sdkmanager-vanilla
+cat >${ASDKTOOLS_HOME}/bin/sdkmanager <<"EOF"
+#!/bin/sh
+if test -n "$http_proxy"; then
+  PROXY_HOST=`echo $http_proxy | sed 's@.*//\(.*\):.*@\1@'`
+  PROXY_PORT=`echo $http_proxy | sed 's@.*//.*:\(.*\)@\1@'`
+  PROXY="--proxy=http --proxy_host=$PROXY_HOST --proxy_port=$PROXY_PORT"
+else
+  PROXY=""
+fi
+exec "`dirname $0`/sdkmanager-vanilla" $PROXY "$@"
+EOF
+for f in ${ASDKTOOLS_HOME}/bin/* ; do
+  chmod +x "$f"
+  ln --symbolic "$f" "/usr/bin/`basename $f`"
+done
+
+
+cat >/install/package-list-minimal.txt <<EOF
+build-tools;26.0.3
+build-tools;27.0.3
+cmake;3.6.4111459
+emulator
+extras;android;gapid;1
+extras;android;gapid;3
+extras;android;m2repository
+extras;google;auto
+extras;google;google_play_services
+extras;google;instantapps
+extras;google;m2repository
+extras;google;market_apk_expansion
+extras;google;market_licensing
+extras;google;simulators
+extras;google;webdriver
+extras;m2repository;com;android;support;constraint;constraint-layout;1.0.2
+extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2
+lldb;2.3
+platforms;android-26
+platforms;android-27
+tools
+ndk-bundle
+EOF
+
+mkdir /root/.android 2>/dev/null || true
+touch /root/.android/repositories.cfg
+yes | sdkmanager --licenses --sdk_root="$ANDROID_HOME"
+sdkmanager --verbose --package_file=/install/package-list-minimal.txt --sdk_root="$ANDROID_HOME"
+test -d "${ANDROID_HOME}/build-tools/27.0.3"
+test -d "${ANDROID_HOME}/ndk-bundle"
+for f in ${ANDROID_HOME}/ndk-bundle/* ; do
+  ln --symbolic "$f" "/usr/bin/`basename $f`"
+done
+echo "export ANDROID_HOME=${ANDROID_HOME}" >> /etc/profile
+

docker/install/ubuntu_install_gradle.sh

+. /etc/profile
+
+set -o errexit -o nounset
+
+GRADLE_HOME=/opt/gradle
+GRADLE_VERSION=4.10-rc-2
+GRADLE_SHA256=e90d3c32910e259814bcca82b3911172ecca1ff1ab5ed69b4de3c1df8b378b40
+
+echo "Downloading Gradle"
+wget --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip"
+echo "Checking Gradle hash"
+echo "${GRADLE_SHA256} *gradle.zip" | sha256sum --check -
+echo "Installing Gradle"
+unzip gradle.zip
+rm gradle.zip
+mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/"
+ln --symbolic "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle

docker/install/ubuntu_install_java.sh

+set -o errexit -o nounset
 apt-get update && apt-get install -y openjdk-8-jdk maven
+test -d "/usr/lib/jvm/java-8-openjdk-amd64/jre"
+echo "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/jre" >> /etc/profile