Merge pull request FloopCZ#205 from FloopCZ/tf-2.2.0

Update TensorFlow to v2.2.0, drop static library support

Author: FloopCZ

Dockerfiles/BAZEL_VERSION

@@ -1 +1 @@
-0.26.1
+2.0.0

Dockerfiles/archlinux-shared renamed to Dockerfiles/archlinux

@@ -2,15 +2,10 @@
 set -e
 
 # parse command line arguments
-
-shared=false
 cuda=false
 
 for key in "$@"; do
     case $key in
-        --shared)
-        shared=true
-        ;;
         --cuda)
         cuda=true
         ;;
@@ -28,20 +23,19 @@ pacman -Syu --noconfirm --needed \
   python-numpy \
   wget
 
-if $shared; then
-    pacman -S --noconfirm --needed \
-      java-environment=8 \
-      libarchive \
-      protobuf \
-      unzip \
-      zip
-    export BAZEL_VERSION=${BAZEL_VERSION:-`cat ./tensorflow_cc/Dockerfiles/BAZEL_VERSION`}
-    bazel_installer=bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
-    wget -P /tmp https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${bazel_installer}
-    chmod +x /tmp/${bazel_installer}
-    /tmp/${bazel_installer}
-    rm /tmp/${bazel_installer}
-fi
+pacman -S --noconfirm --needed \
+  java-environment=8 \
+  libarchive \
+  protobuf \
+  unzip \
+  zip
+export BAZEL_VERSION=${BAZEL_VERSION:-`cat ./tensorflow_cc/Dockerfiles/BAZEL_VERSION`}
+bazel_installer=bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
+wget -P /tmp https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${bazel_installer}
+chmod +x /tmp/${bazel_installer}
+/tmp/${bazel_installer}
+rm /tmp/${bazel_installer}
+
 if $cuda; then
     pacman -S --noconfirm --needed \
       cuda \

Dockerfiles/archlinux-shared-cuda renamed to Dockerfiles/archlinux-cuda

@@ -2,18 +2,6 @@
 set -e
 cwd="`pwd`"
 
-### parse command line arguments ###
-
-shared=false
-
-for key in "$@"; do
-    case $key in
-        --shared)
-        shared=true
-        ;;
-    esac
-done
-
 ### prepare an unprivileged user
 
 groupadd -r tensorflow_cc
@@ -30,16 +18,11 @@ chown -R tensorflow_cc:tensorflow_cc tensorflow_cc/tensorflow_cc/build
 chmod go+rX tensorflow_cc/tensorflow_cc/build
 cd tensorflow_cc/tensorflow_cc/build
 
-# configure only shared or only static library
-if $shared; then
-    cmake -DTENSORFLOW_STATIC=OFF -DTENSORFLOW_SHARED=ON ..;
-else
-    cmake ..;
-fi
-
 # build and install
+cmake ..
 make
 rm -rf /home/tensorflow_cc/.cache
+rm -rf /root/.cache
 make install
 cd "$cwd"
 rm -rf tensorflow_cc/tensorflow_cc/build

Dockerfiles/archlinux-static

@@ -2,15 +2,10 @@
 set -e
 
 # parse command line arguments
-
-shared=false
 cuda=false
 
 for key in "$@"; do
     case $key in
-        --shared)
-        shared=true
-        ;;
         --cuda)
         cuda=true
         ;;
@@ -39,16 +34,15 @@ apt-get -y install \
   sudo \
   wget
 
-if $shared; then
-    # install bazel for the shared library version
-    export BAZEL_VERSION=${BAZEL_VERSION:-`cat ./tensorflow_cc/Dockerfiles/BAZEL_VERSION`}
-    apt-get -y install pkg-config zip g++ zlib1g-dev unzip python
-    bazel_installer=bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
-    wget -P /tmp https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${bazel_installer}
-    chmod +x /tmp/${bazel_installer}
-    /tmp/${bazel_installer}
-    rm /tmp/${bazel_installer}
-fi
+# install bazel
+export BAZEL_VERSION=${BAZEL_VERSION:-`cat ./tensorflow_cc/Dockerfiles/BAZEL_VERSION`}
+apt-get -y install pkg-config zip g++ zlib1g-dev unzip python
+bazel_installer=bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh
+wget -P /tmp https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/${bazel_installer}
+chmod +x /tmp/${bazel_installer}
+/tmp/${bazel_installer}
+rm /tmp/${bazel_installer}
+
 if $cuda; then
     # install libcupti
     apt-get -y install cuda-command-line-tools-10-1