Merge pull request #17 from snipsco/task/tf1.3.1

Task/tf1.3.1

Author: fredszaq

README.md

@@ -12,8 +12,8 @@ Supported OS / Arch:
 
 OS | Available archs
 ---|---
-Debian Like | `armhf` [[deb]](https://s3.amazonaws.com/snips/tensorflow-deb/libtensorflow_1.2.1-snips-1_armhf.deb) (raspbian, crosscompiled, tested on Raspberry Pi 0, 2 & 3) <br> `amd64` [[deb]](https://s3.amazonaws.com/snips/tensorflow-deb/libtensorflow_1.2.1-snips-1_amd64.deb)
-Android | `arm` [[sysroot overlay]](https://s3.amazonaws.com/snips/tensorflow-android/tensorflow-android-armeabi-v7a-v1.2.1.tar.gz)
+Debian Like | `armhf` [[deb]](https://s3.amazonaws.com/snips/tensorflow-deb/libtensorflow_1.3.1-snips-2_armhf.deb) (raspbian, crosscompiled, tested on Raspberry Pi 0, 2 & 3) <br> `amd64` [[deb]](https://s3.amazonaws.com/snips/tensorflow-deb/libtensorflow_1.3.1-snips-2_amd64.deb)
+Android | `armeabi-v7a` [[sysroot overlay]](https://s3.amazonaws.com/snips/tensorflow-android/tensorflow-android-armeabi-v7a-1.3.1-snips-2.tar.gz) <br> `arm64-v8a` [[sysroot overlay]](https://s3.amazonaws.com/snips/tensorflow-android/tensorflow-android-arm64-v8a-1.3.1-snips-2.tar.gz) <br> `x86` [[sysroot overlay]](https://s3.amazonaws.com/snips/tensorflow-android/tensorflow-android-x86-1.3.1-snips-2.tar.gz) <br> `x86_64` [[sysroot overlay]](https://s3.amazonaws.com/snips/tensorflow-android/tensorflow-android-x86_64-1.3.1-snips-2.tar.gz)
 Archlinux | `i686` / `x86_64` use this aur [[PKGBUILD]](https://aur.archlinux.org/packages/tensorflow-git/)
 macOS | `x86_64` `brew install libtensorflow`
 
@@ -47,7 +47,7 @@ Script | Description
 `compile.sh` | Clones and build build tensorflow for current machine. Takes the tensorflow version as a parameter
 `cross-compile.sh` | Generic script for cloning and building tensorflow using a cross toolchain. Launch it without args for usage
 `compile-arm.sh` | Clones the `raspberry/tools` repository an launches a cross compilation using the toolchain in it. Takes the tensorflow version as a parameter
-`compile-android.sh` | Download Android NDK and launch a crosscompilation for android using it. Takes the tensorflow version and android arch as parameters
+`compile-android.sh` | Download Android NDK and launch a crosscompilation for android using it. Takes the tensorflow version, android arch and package version as parameters
 `create-pkgconfig.sh` | Generic script for creating a pc. Launch it without args for usage
 
 ### Building a deb

compile-android.sh

@@ -2,10 +2,11 @@
 
 set -e
 
-USAGE="Usage : $0 <tensorflow version> <android arch>"
+USAGE="Usage : $0 <tensorflow version> <android arch> <package version>"
 
 TENSORFLOW_VERSION=${1?$USAGE}
 ANDROID_ARCH=${2?$USAGE}
+PACKAGE_VERSION=${3?$USAGE}
 
 BUILD_DIR=`pwd`/target
 
@@ -20,7 +21,7 @@ NDK_ARCHIVE=$NDK_NAME-linux-x86_64.zip
 NDK_DIR=$BUILD_DIR/$NDK_NAME
 
 # We create a dir with a tree containing the .so and a .pc file that can be overlayed over a sysroot
-PKG_NAME=tensorflow-android-$ANDROID_ARCH-$TENSORFLOW_VERSION
+PKG_NAME=tensorflow-android-$ANDROID_ARCH-$PACKAGE_VERSION
 PKG_DIR=$BUILD_DIR/$PKG_NAME
 FINAL_PKG=$PKG_DIR.tar.gz
 
@@ -105,12 +106,14 @@ mkdir -p $SO_INSTALL_DIR
 mkdir -p $PKG_CONFIG_INSTALL_DIR
 mkdir -p $HEADER_INSTALL_DIR
 
-cp $TF_SO $SO_INSTALL_DIR
+install -Dm755 $TF_SO $SO_INSTALL_DIR
 
-cp $TF_HEADER $HEADER_INSTALL_DIR
+install -Dm644  $TF_HEADER $HEADER_INSTALL_DIR
 
 $CREATE_PKGCONFIG "$LIB_NAME" "/$SO_INSTALL_DIR" "${TENSORFLOW_VERSION/v}" "Tensorflow C library" > $PKG_CONFIG_INSTALL_DIR/$LIB_NAME.pc
 
+chmod 644 $PKG_CONFIG_INSTALL_DIR/$LIB_NAME.pc
+
 cd $BUILD_DIR
 
 tar -cf $FINAL_PKG $PKG_NAME/*

debian/versions.sh

@@ -1,4 +1,4 @@
 #/usr/env/bin bash
-export TF_VERSION="v1.2.1"
-export TF_DEB_VERSION="1.2.1-snips-1"
+export TF_VERSION="107cc777af7880c140d089e44ad898a6ba929286"
+export TF_DEB_VERSION="1.3.1-snips-2"