diff --git a/Dockerfiles/BAZEL_VERSION b/Dockerfiles/BAZEL_VERSION index ac14c3d..f22d756 100644 --- a/Dockerfiles/BAZEL_VERSION +++ b/Dockerfiles/BAZEL_VERSION @@ -1 +1 @@ -5.1.1 +6.5.0 diff --git a/Dockerfiles/install-ubuntu.sh b/Dockerfiles/install-ubuntu.sh index 43b5987..17f3c1c 100755 --- 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-11-6 + apt-get -y install cuda-command-line-tools-12-3 fi apt-get -y clean diff --git a/Dockerfiles/ubuntu-cuda b/Dockerfiles/ubuntu-cuda index eea30ed..acc2b99 100644 --- a/Dockerfiles/ubuntu-cuda +++ b/Dockerfiles/ubuntu-cuda @@ -1,4 +1,4 @@ -FROM nvidia/cuda:11.6.2-cudnn8-devel-ubuntu20.04 +FROM nvidia/cuda:12.3.2-cudnn9-devel-ubuntu22.04 # copy the contents of this repository to the container COPY . tensorflow_cc diff --git a/tensorflow_cc/CMakeLists.txt b/tensorflow_cc/CMakeLists.txt index 9e23a37..dce55bc 100644 --- a/tensorflow_cc/CMakeLists.txt +++ b/tensorflow_cc/CMakeLists.txt @@ -12,7 +12,7 @@ set(LOCAL_RAM_RESOURCES 4096 CACHE STRING "The amount of local RAM resources pas set(LOCAL_CPU_RESOURCES HOST_CPUS CACHE STRING "The amount of local CPU cores passed to bazel scheduler (e.g., 2).") set(TENSORFLOW_TAG "v${version}" CACHE STRING "The tensorflow release tag to be checked out (default v${version}).") option(INSTALL_PROTOBUF "Install protobuf compatible with tensorflow version." OFF) -set(CMAKE_CXX_STANDARD 14 CACHE STRING "The C++ standard for building and linking the library (e.g., 14).") +set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard for building and linking the library (e.g., 14).") # ------------- # CMake Options diff --git a/tensorflow_cc/PROJECT_VERSION b/tensorflow_cc/PROJECT_VERSION index c8e38b6..68e69e4 100644 --- a/tensorflow_cc/PROJECT_VERSION +++ b/tensorflow_cc/PROJECT_VERSION @@ -1 +1 @@ -2.9.0 +2.15.0 diff --git a/tensorflow_cc/cmake/build_tensorflow.sh.in b/tensorflow_cc/cmake/build_tensorflow.sh.in index c609efa..f6a9243 100755 --- a/tensorflow_cc/cmake/build_tensorflow.sh.in +++ b/tensorflow_cc/cmake/build_tensorflow.sh.in @@ -88,9 +88,9 @@ fi # set bazel options for c++17 standard if necessary cxx_std_opts="" -if [ "@CMAKE_CXX_STANDARD@" == 17 ]; then - echo "Using C++17 standard" - cxx_std_opts="--config=c++17_gcc" +if [ "@CMAKE_CXX_STANDARD@" == 20 ]; then + echo "Using C++20 standard" + cxx_std_opts="--config=c++20_gcc" fi # configure and build diff --git a/ubuntu-requirements.sh b/ubuntu-requirements.sh index 6ead29e..87c58db 100755 --- a/ubuntu-requirements.sh +++ b/ubuntu-requirements.sh @@ -13,7 +13,7 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then apt-get -y update apt-get -y install \ cmake \ - g++-9 \ + g++ \ git \ python3-dev \ python3-numpy \