Merge pull request #248 from FloopCZ/tf-v2.4.0

TF v2.4.0

Dockerfiles/archlinux-cuda

@@ -10,4 +10,4 @@ RUN ./tensorflow_cc/Dockerfiles/install-archlinux.sh --cuda
 
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility
-ENV NVIDIA_REQUIRE_CUDA "cuda>=10.1"
+ENV NVIDIA_REQUIRE_CUDA "cuda>=11.1"

Dockerfiles/install-archlinux.sh

@@ -59,5 +59,5 @@ fi
 # cleanup packages
 rm -rvf /usr/local/lib/bazel/
 rm -vf /usr/local/bin/bazel
-pacman --noconfirm -R jdk11-openjdk python python-numpy
+pacman --noconfirm -R jdk11-openjdk
 pacman --noconfirm -Rns $(pacman -Qtdq)

Dockerfiles/ubuntu-cuda

@@ -1,4 +1,4 @@
-FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
+FROM nvidia/cuda:11.1-cudnn8-devel-ubuntu18.04
 
 # copy the contents of this repository to the container
 COPY . tensorflow_cc

README.md

@@ -1,6 +1,6 @@
 # tensorflow_cc
 [![Build Status](http://elm.floop.cz:8080/buildStatus/icon?job=tensorflow_cc)](http://elm.floop.cz:8080/job/tensorflow_cc/)
-[![TF version](https://img.shields.io/badge/TF%20version-2.3.1-brightgreen.svg)]()
+[![TF version](https://img.shields.io/badge/TF%20version-2.4.0-brightgreen.svg)]()
 
 This repository makes possible the usage of the [TensorFlow C++](https://www.tensorflow.org/api_docs/cc/) API from the outside of the TensorFlow source code folders and without the use of the [Bazel](https://bazel.build/) build system.
 
@@ -46,12 +46,13 @@ sudo apt-get install cmake curl g++-7 git python3-dev python3-numpy sudo wget
 
 In order to build the TensorFlow itself, the build procedure also requires [Bazel](https://bazel.build/):
 ```
-curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
+curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor > bazel.gpg
+sudo mv bazel.gpg /etc/apt/trusted.gpg.d/
 echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
 sudo apt-get update && sudo apt-get install bazel
 ```
 
-If you require GPU support on Ubuntu, please also install NVIDIA CUDA Toolkit (>=10.1), NVIDIA drivers, cuDNN, and `cuda-command-line-tools` package.
+If you require GPU support on Ubuntu, please also install NVIDIA CUDA Toolkit (>=11.1), NVIDIA drivers, cuDNN, and `cuda-command-line-tools` package.
 The build procedure will automatically detect CUDA if it is installed in `/opt/cuda` or `/usr/local/cuda` directories.
 
 ##### Arch Linux:

tensorflow_cc/PROJECT_VERSION

@@ -1 +1 @@
-2.3.1
+2.4.0

tensorflow_cc/cmake/build_tensorflow.sh.in

@@ -11,15 +11,13 @@ export CC_OPT_FLAGS=${CC_OPT_FLAGS:-"-march=ivybridge"}
 export TF_NEED_GCP=${TF_NEED_GCP:-0}
 export TF_NEED_HDFS=${TF_NEED_HDFS:-0}
 export TF_NEED_OPENCL=${TF_NEED_OPENCL:-0}
-export TF_NEED_OPENCL_SYCL=${TF_NEED_OPENCL_SYCL:-0}
 export TF_NEED_TENSORRT=${TF_NEED_TENSORRT:-0}
 export TF_NEED_NGRAPH=${TF_NEED_NGRAPH:-0}
 export TF_NEED_JEMALLOC=${TF_NEED_JEMALLOC:-1}
 export TF_NEED_VERBS=${TF_NEED_VERBS:-0}
 export TF_NEED_MKL=${TF_NEED_MKL:-1}
 export TF_DOWNLOAD_MKL=${TF_DOWNLOAD_MKL:-1}
 export TF_NEED_MPI=${TF_NEED_MPI:-0}
-export TF_ENABLE_XLA=${TF_ENABLE_XLA:-1}
 export TF_NEED_AWS=${TF_NEED_AWS:-0}
 export TF_NEED_GDR=${TF_NEED_GDR:-0}
 export TF_CUDA_CLANG=${TF_CUDA_CLANG:-0}
@@ -63,7 +61,11 @@ if [ "$cuda_allowed" == true ] && [ "$cuda_available" == true ]; then
 
     # choose the right version of CUDA compiler
     if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
-        if   hash gcc-9 2>/dev/null && version_gt 9.4 `gcc-9 -dumpversion`; then
+        if   hash gcc 2>/dev/null && version_gt 10.3 `gcc -dumpversion`; then
+            export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc"}
+        elif hash gcc-10 2>/dev/null && version_gt 10.3 `gcc-10 -dumpversion`; then
+            export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-10"}
+        elif hash gcc-9 2>/dev/null && version_gt 9.4 `gcc-9 -dumpversion`; then
             export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-9"}
         elif hash gcc-8 2>/dev/null && version_gt 8.5 `gcc-8 -dumpversion`; then
             export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-8"}