Merge pull request #291 from FloopCZ/v2.9.0

Update tensorflow to v2.9.0
FloopCZ · May 23, 2022 · 84f40ed · 84f40ed
2 parents c5ae816 + 49c5387
commit 84f40ed
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 18 deletions.
diff --git a/Dockerfiles/BAZEL_VERSION b/Dockerfiles/BAZEL_VERSION
@@ -1 +1 @@
-4.2.1
+5.1.1
diff --git a/Dockerfiles/install-ubuntu.sh b/Dockerfiles/install-ubuntu.sh
@@ -17,7 +17,7 @@ done
 
 if $cuda; then
     # install libcupti
-    apt-get -y install cuda-command-line-tools-10-1
+    apt-get -y install cuda-command-line-tools-11-6
 fi
 
 apt-get -y clean

diff --git a/Dockerfiles/ubuntu-cuda b/Dockerfiles/ubuntu-cuda
@@ -1,4 +1,4 @@
-FROM nvidia/cuda:11.1-cudnn8-devel-ubuntu18.04
+FROM nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04
 
 # copy the contents of this repository to the container
 COPY . tensorflow_cc

diff --git a/README.md b/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.8.0-brightgreen.svg)]()
+[![TF version](https://img.shields.io/badge/TF%20version-2.9.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.
 

diff --git a/tensorflow_cc/CMakeLists.txt b/tensorflow_cc/CMakeLists.txt
@@ -83,23 +83,14 @@ install(
                  REGEX ".*Eigen.*"
 )
 install(
-  FILES "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/tensorflow/libtensorflow_cc.so"
+  DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/tensorflow/"
   DESTINATION lib
-  RENAME libtensorflow_cc.so.${PROJECT_VERSION_MAJOR}
-  OPTIONAL
+  FILES_MATCHING PATTERN "libtensorflow_cc.so*"
 )
 install(
-  FILES "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/bin/tensorflow/libtensorflow_cc.so"
+  DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tensorflow/bazel-bin/bin/tensorflow/"
   DESTINATION lib
-  RENAME libtensorflow_cc.so.${PROJECT_VERSION_MAJOR}
-  OPTIONAL
-)
-# Make versioned symlinks to the library
-install(CODE "execute_process(                          \
-  COMMAND ${CMAKE_COMMAND} -E create_symlink            \
-    libtensorflow_cc.so.${PROJECT_VERSION_MAJOR}        \
-    ${CMAKE_INSTALL_PREFIX}/lib/libtensorflow_cc.so     \
-  )"
+  FILES_MATCHING PATTERN "libtensorflow_cc.so*"
 )
 
 # --------------------------

diff --git a/tensorflow_cc/PROJECT_VERSION b/tensorflow_cc/PROJECT_VERSION
@@ -1 +1 @@
-2.8.0
+2.9.0