Merge remote-tracking branch 'origin/master' into system-protobuf

Author: FloopCZ

Dockerfiles/BAZEL_VERSION

@@ -1 +1 @@
-3.7.2
+4.2.1

README.md

@@ -1,6 +1,6 @@
 # tensorflow_cc
 [![Build Status](http://oak.floop.cz:8080/buildStatus/icon?job=tensorflow_cc)](http://oak.floop.cz:8080/job/tensorflow_cc/)
-[![TF version](https://img.shields.io/badge/TF%20version-2.5.0-brightgreen.svg)]()
+[![TF version](https://img.shields.io/badge/TF%20version-2.8.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.
 
@@ -17,7 +17,7 @@ docker run -it floopcz/tensorflow_cc:ubuntu /bin/bash
 
 If you also want to utilize your NVIDIA GPU, install [NVIDIA Docker](https://github.com/NVIDIA/nvidia-docker) and run:
 ```bash
-docker run --runtime=nvidia -it floopcz/tensorflow_cc:ubuntu-cuda /bin/bash
+docker run --gpus all -it floopcz/tensorflow_cc:ubuntu-cuda /bin/bash
 ```
 
 The list of available images:

build-all-dockerfiles.sh

@@ -3,13 +3,32 @@
 # Parse command line arguments.
 prune=false
 push=false
-for key in "$@"; do
+cpu_shares=0
+cpu_quota=-1
+while [[ $# -gt 0 ]]; do
+    key="$1"
     case $key in
         --prune)
         prune=true
+        shift
         ;;
         --push)
         push=true
+        shift
+        ;;
+        --cpu-shares)
+        cpu_shares="$2"
+        shift
+        shift
+        ;;
+        --cpu-quota)
+        cpu_quota="$2"
+        shift
+        shift
+        ;;
+        *)
+        echo "Unknown option $key"
+        exit 1
         ;;
     esac
 done
@@ -18,7 +37,7 @@ done
 PROJECT_VERSION="$(cat ./tensorflow_cc/PROJECT_VERSION)"
 
 for tag in ubuntu ubuntu-cuda archlinux archlinux-cuda; do
-    docker build --pull -t floopcz/tensorflow_cc:${tag} -f Dockerfiles/${tag} .
+    docker build --cpu-shares="${cpu_shares}" --cpu-quota="${cpu_quota}" --pull -t floopcz/tensorflow_cc:${tag} -f Dockerfiles/${tag} .
     docker tag floopcz/tensorflow_cc:${tag} floopcz/tensorflow_cc:${tag}-"${PROJECT_VERSION}"
     if $push; then
         docker push floopcz/tensorflow_cc:${tag}

tensorflow_cc/PROJECT_VERSION

@@ -1 +1 @@
-2.5.0
+2.8.0

tensorflow_cc/cmake/TensorflowBase.cmake

@@ -19,7 +19,4 @@ ExternalProject_Add(
           COMMAND mkdir -p "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/bin/tensorflow/include/src"
           COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/tensorflow/include/src/__placeholder__.h"
           COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/bin/tensorflow/include/src/__placeholder__.h"
-  # Fix compilation with CUDA 11.3.
-  PATCH_COMMAND cp "${CMAKE_CURRENT_SOURCE_DIR}/patches/v2.5.0-Fix-NCCL-build-failure-with-CUDA-11.3.patch" .
-        COMMAND patch -p1 < v2.5.0-Fix-NCCL-build-failure-with-CUDA-11.3.patch
 )

tensorflow_cc/cmake/build_tensorflow.sh.in

@@ -53,15 +53,21 @@ if [ "$cuda_allowed" == true ] && [ "$cuda_available" == true ]; then
     echo "CUDA support enabled"
     cuda_config_opts="--config=cuda"
     export TF_NEED_CUDA=1
-    export TF_CUDA_COMPUTE_CAPABILITIES=${TF_CUDA_COMPUTE_CAPABILITIES:-"3.5,7.0"}  # default from configure.py
+    # Capabilities are taken from Archlinux tensorflow build.
+    # https://github.com/tensorflow/tensorflow/blob/1ba2eb7b313c0c5001ee1683a3ec4fbae01105fd/third_party/gpus/cuda_configure.bzl#L411-L446
+    # according to the above, we should be specifying CUDA compute capabilities as 'sm_XX' or 'compute_XX' from now on
+    # add latest PTX for future compatibility
+    export TF_CUDA_COMPUTE_CAPABILITIES=${TF_CUDA_COMPUTE_CAPABILITIES:-"sm_52,sm_53,sm_60,sm_61,sm_62,sm_70,sm_72,sm_75,sm_80,sm_86,compute_86"}
     export TF_CUDA_PATHS=${TF_CUDA_PATHS:-"/opt/cuda,/usr/local/cuda,/usr/local,/usr/cuda,/usr"}
     export TF_CUDA_VERSION="$(nvcc --version | sed -n 's/^.*release \(.*\),.*/\1/p')"
     export TF_NCCL_VERSION="$(find /opt /usr -name 'libnccl.so.*' -path '*/cuda*' | tail -n1 | sed -r 's/^.*\.so\.//')"
     export TF_CUDNN_VERSION="$(find /opt /usr -name 'libcudnn.so.*' -path '*/cuda*' | tail -n1 | sed -r 's/^.*\.so\.//')"
 
     # choose the right version of CUDA compiler
     if [ -z "$GCC_HOST_COMPILER_PATH" ]; then
-        if hash gcc-10 2>/dev/null && version_gt 10.3 `gcc-10 -dumpversion`; then
+        if hash gcc-11 2>/dev/null && version_gt 11.1 `gcc-11 -dumpversion`; then
+            export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-11"}
+        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"}
@@ -76,12 +82,7 @@ if [ "$cuda_allowed" == true ] && [ "$cuda_available" == true ]; then
         elif hash gcc-4 2>/dev/null && version_gt 4.9 `gcc-4 -dumpversion`; then
             export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc-4"}
         else
-            echo "No supported CUDA compiler available. If you are sure your compiler"
-            echo "version is supported by your CUDA version, please run e.g.:"
-            echo "export GCC_HOST_COMPILER_PATH=/usr/bin/gcc"
-            echo "before the build. For the list of supported compilers refer to:"
-            echo "https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html"
-            exit 1
+            export GCC_HOST_COMPILER_PATH=${GCC_HOST_COMPILER_PATH:-"/usr/bin/gcc"}
         fi
     fi
 

tensorflow_cc/patches/v2.5.0-Fix-NCCL-build-failure-with-CUDA-11.3.patch

@@ -13,7 +13,7 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
     apt-get -y update
     apt-get -y install \
     cmake \
-    g++-7 \
+    g++-9 \
     git \
     python3-dev \
     python3-numpy \
@@ -22,7 +22,8 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
 
     # install bazel
     export BAZEL_VERSION=${BAZEL_VERSION:-`cat $(dirname "$0")/Dockerfiles/BAZEL_VERSION`}
-    apt-get -y install pkg-config zip g++ zlib1g-dev unzip python
+    apt-get -y install pkg-config zip g++ zlib1g-dev unzip python3
+    update-alternatives --install /usr/bin/python python /usr/bin/python3 1
     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}
@@ -33,4 +34,4 @@ else
     echo "This script supports only Debian-based operating systems (like Ubuntu)." \
          "Please consult README file for manual installation on your '$OSTYPE' OS."
     exit 1
-fi
+fi