Update to tensorflow 2.1 for amd64, handle basic scores tflite model

Dockerfile.base.aarch64

@@ -4,7 +4,7 @@ FROM debian:buster as builder
 RUN dpkg --add-architecture arm64 && \
     apt-get update && apt-get install -y --no-install-recommends \
     pkg-config zip zlib1g-dev unzip wget bash-completion git curl \
-    build-essential patch g++ python python-future python3 \
+    build-essential patch g++ python python-future python-numpy python-six python3 \
     cmake ca-certificates \
     libc6-dev:arm64 libstdc++6:arm64 libusb-1.0-0:arm64
 
@@ -20,7 +20,7 @@ RUN wget https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel_0.24
     rm bazel_0.24.1-linux-x86_64.deb
 
 # Download tensorflow sources
-ARG TF_VERSION="r1.15"
+ARG TF_VERSION="v1.15.0"
 ENV TF_VERSION $TF_VERSION
 RUN cd /opt && git clone https://github.com/tensorflow/tensorflow.git --branch $TF_VERSION --single-branch
 
@@ -37,7 +37,7 @@ ENV TF_NEED_GDR=0 TF_NEED_AWS=0 TF_NEED_GCP=0 TF_NEED_CUDA=0 TF_NEED_HDFS=0 TF_N
 RUN cd /opt/tensorflow && yes '' | ./configure
 
 # Tensorflow build flags for rpi
-ENV BAZEL_COPT_FLAGS="--local_resources 16000,16,1 --copt=-march=armv8-a+crc+simd --copt=-mtune=cortex-a53 --copt=-O3 --copt=-flax-vector-conversions --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR --config=monolithic --copt=-funsafe-math-optimizations --copt=-ftree-vectorize --copt=-fomit-frame-pointer --copt=-DRASPBERRY_PI --config=noaws --config=nogcp --config=nohdfs --config=nokafka --config=noignite --define tensorflow_mkldnn_contraction_kernel=0"
+ENV BAZEL_COPT_FLAGS="--local_resources 16000,16,1 --copt=-march=armv8-a+crc+simd --copt=-mtune=cortex-a53 --copt=-O3 --copt=-flax-vector-conversions --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR --config=monolithic --copt=-funsafe-math-optimizations --copt=-ftree-vectorize --copt=-fomit-frame-pointer --copt=-DRASPBERRY_PI --config=noaws --config=nohdfs --define tensorflow_mkldnn_contraction_kernel=0"
 ENV BAZEL_EXTRA_FLAGS="--cpu=armeabi --crosstool_top=//tools/local_arm_compiler:toolchain"
 
 # Compile and build tensorflow lite

Dockerfile.base.amd64

@@ -3,7 +3,7 @@ FROM debian:buster as builder
 # Install reqs with cross compile support
 RUN apt-get update && apt-get install -y --no-install-recommends \
     pkg-config zip zlib1g-dev unzip wget bash-completion git curl \
-    build-essential patch g++ python python-future python3 \
+    build-essential patch g++ python python-future python-numpy python-six python3 \
     cmake ca-certificates \
     libc6-dev libstdc++6 libusb-1.0-0
 
@@ -14,12 +14,12 @@ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.9.1/pr
     rm protoc-3.9.1-linux-x86_64.zip
 
 # Install bazel
-RUN wget https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel_0.24.1-linux-x86_64.deb && \
-    dpkg -i bazel_0.24.1-linux-x86_64.deb && \
-    rm bazel_0.24.1-linux-x86_64.deb
+RUN wget https://github.com/bazelbuild/bazel/releases/download/0.27.1/bazel_0.27.1-linux-x86_64.deb && \
+    dpkg -i bazel_0.27.1-linux-x86_64.deb && \
+    rm bazel_0.27.1-linux-x86_64.deb
 
 # Download tensorflow sources
-ARG TF_VERSION="r1.15"
+ARG TF_VERSION="v2.1.0-rc1"
 ENV TF_VERSION $TF_VERSION
 RUN cd /opt && git clone https://github.com/tensorflow/tensorflow.git --branch $TF_VERSION --single-branch
 
@@ -28,7 +28,7 @@ ENV TF_NEED_GDR=0 TF_NEED_AWS=0 TF_NEED_GCP=0 TF_NEED_CUDA=0 TF_NEED_HDFS=0 TF_N
 RUN cd /opt/tensorflow && yes '' | ./configure
 
 # Tensorflow build flags for rpi
-ENV BAZEL_COPT_FLAGS="--local_resources 16000,16,1 --config monolithic --copt=-O3 --copt=-fomit-frame-pointer --copt=-mfpmath=both --copt=-mavx --copt=-msse4.2 --incompatible_no_support_tools_in_action_inputs=false --config=noaws --config=nogcp --config=nohdfs --config=nokafka --config=noignite"
+ENV BAZEL_COPT_FLAGS="--local_resources 16000,16,1 --config monolithic --copt=-O3 --copt=-fomit-frame-pointer --copt=-mfpmath=both --copt=-mavx --copt=-msse4.2 --incompatible_no_support_tools_in_action_inputs=false --config=noaws --config=nohdfs"
 ENV BAZEL_EXTRA_FLAGS=""
 
 # Compile and build tensorflow lite

Dockerfile.base.noavx

@@ -3,7 +3,7 @@ FROM debian:buster as builder
 # Install reqs with cross compile support
 RUN apt-get update && apt-get install -y --no-install-recommends \
     pkg-config zip zlib1g-dev unzip wget bash-completion git curl \
-    build-essential patch g++ python python-future python3 \
+    build-essential patch g++ python python-future python-numpy python-six python3 \
     cmake ca-certificates \
     libc6-dev libstdc++6 libusb-1.0-0
 
@@ -14,12 +14,12 @@ RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.9.1/pr
     rm protoc-3.9.1-linux-x86_64.zip
 
 # Install bazel
-RUN wget https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel_0.24.1-linux-x86_64.deb && \
-    dpkg -i bazel_0.24.1-linux-x86_64.deb && \
-    rm bazel_0.24.1-linux-x86_64.deb
+RUN wget https://github.com/bazelbuild/bazel/releases/download/0.27.1/bazel_0.27.1-linux-x86_64.deb && \
+    dpkg -i bazel_0.27.1-linux-x86_64.deb && \
+    rm bazel_0.27.1-linux-x86_64.deb
 
 # Download tensorflow sources
-ARG TF_VERSION="r1.15"
+ARG TF_VERSION="v2.1.0-rc1"
 ENV TF_VERSION $TF_VERSION
 RUN cd /opt && git clone https://github.com/tensorflow/tensorflow.git --branch $TF_VERSION --single-branch
 
@@ -28,7 +28,7 @@ ENV TF_NEED_GDR=0 TF_NEED_AWS=0 TF_NEED_GCP=0 TF_NEED_CUDA=0 TF_NEED_HDFS=0 TF_N
 RUN cd /opt/tensorflow && yes '' | ./configure
 
 # Tensorflow build flags for rpi
-ENV BAZEL_COPT_FLAGS="--local_resources 16000,16,1 --config monolithic --copt=-O3 --copt=-fomit-frame-pointer --config=noaws --config=nogcp --config=nohdfs --config=nokafka --config=noignite"
+ENV BAZEL_COPT_FLAGS="--local_resources 16000,16,1 --config monolithic --copt=-O3 --copt=-fomit-frame-pointer --config=noaws --config=nohdfs"
 ENV BAZEL_EXTRA_FLAGS=""
 
 # Compile and build tensorflow lite

Dockerfile.base.rpi

@@ -4,7 +4,7 @@ FROM debian:buster as builder
 RUN dpkg --add-architecture armhf && \
     apt-get update && apt-get install -y --no-install-recommends \
     pkg-config zip zlib1g-dev unzip wget bash-completion git curl \
-    build-essential patch g++ python python-future python3 \
+    build-essential patch g++ python python-future python-numpy python-six python3 \
     cmake ca-certificates \
     libc6-dev:armhf libstdc++6:armhf libusb-1.0-0:armhf
 
@@ -20,7 +20,7 @@ RUN wget https://github.com/bazelbuild/bazel/releases/download/0.24.1/bazel_0.24
     rm bazel_0.24.1-linux-x86_64.deb
 
 # Download tensorflow sources
-ARG TF_VERSION="r1.15"
+ARG TF_VERSION="v1.15.0"
 ENV TF_VERSION $TF_VERSION
 RUN cd /opt && git clone https://github.com/tensorflow/tensorflow.git --branch $TF_VERSION --single-branch
 
@@ -37,7 +37,7 @@ ENV TF_NEED_GDR=0 TF_NEED_AWS=0 TF_NEED_GCP=0 TF_NEED_CUDA=0 TF_NEED_HDFS=0 TF_N
 RUN cd /opt/tensorflow && yes '' | ./configure
 
 # Tensorflow build flags for rpi
-ENV BAZEL_COPT_FLAGS="--local_resources 16000,16,1 --copt=-march=armv7-a --copt=-mfpu=neon-vfpv4 --copt=-mfloat-abi=hard --copt=-O3 --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 --config=monolithic --copt=-funsafe-math-optimizations --copt=-ftree-vectorize --copt=-fomit-frame-pointer --copt=-DRASPBERRY_PI --config=noaws --config=nogcp --config=nohdfs --config=nokafka --config=noignite --define tensorflow_mkldnn_contraction_kernel=0"
+ENV BAZEL_COPT_FLAGS="--local_resources 16000,16,1 --copt=-march=armv7-a --copt=-mfpu=neon-vfpv4 --copt=-mfloat-abi=hard --copt=-O3 --copt=-std=c++11 --copt=-DS_IREAD=S_IRUSR --copt=-DS_IWRITE=S_IWUSR --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1 --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2 --copt=-U__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8 --config=monolithic --copt=-funsafe-math-optimizations --copt=-ftree-vectorize --copt=-fomit-frame-pointer --copt=-DRASPBERRY_PI --config=noaws --config=nohdfs --define tensorflow_mkldnn_contraction_kernel=0"
 ENV BAZEL_EXTRA_FLAGS="--cpu=armeabi --crosstool_top=//tools/local_arm_compiler:toolchain"
 
 # Compile and build tensorflow lite

README.md

@@ -161,7 +161,7 @@ Example: `docker run -it --device /dev/bus/usb -p 8080:8080 snowzach/doods:lates
 ## Misc
 Special thanks to https://github.com/mattn/go-tflite as I would have never been able to figure out all the CGO stuff. I really wanted to write this in Go but I'm not good enough at C++/CGO to do it. Most of the tflite code is taken from that repo and customized for this tool.
 
-And special thanks to @marianopeck and @PINTO0309 for help in building tensorflow and binaries for bazel on the arm. 
+And special thanks to @lhelontra, @marianopeck and @PINTO0309 for help in building tensorflow and binaries for bazel on the arm. 
 
 ## Docker Images
 There are several published Docker images that you can use