Skip to content

Commit 9d3ea67

Browse files
lreiherlreiher
authored
Merge pull request #3 from ika-rwth-aachen/new-versions
Support 2.9.3 and 2.8.4, prepare 2.10+
2 parents 54ca7d6 + 76fe237 commit 9d3ea67

12 files changed

+84
-43
lines changed

‎Makefile‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,26 @@
2323
MAKEFLAGS += --no-print-directory
2424
MAKEFILE_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
2525

26+
# build architecture
27+
DEFAULT_ARCH := $(shell dpkg --print-architecture)
28+
ARCH := $(if $(ARCH),$(ARCH),$(DEFAULT_ARCH))
29+
2630
# defaults
27-
DEFAULT_TF_VERSION := 2.9.2
28-
TF_VERSIONS := 2.9.2 2.9.1 2.9.0 2.8.3 2.8.2 2.8.1 2.8.0 2.7.4 2.7.3 2.7.2 2.7.1 2.7.0 2.6.5 2.6.4 2.6.3 2.6.2 2.6.1 2.6.0 2.5.3 2.5.2 2.5.1 2.5.0 2.4.4 2.4.3 2.4.2 2.4.1 2.4.0 2.3.4 2.3.3 2.3.2 2.3.1 2.3.0 2.2.3 2.2.2 2.2.1 2.2.0 2.1.4 2.1.3 2.1.2 2.1.1 2.1.0 2.0.4 2.0.3 2.0.2 2.0.1 2.0.0
31+
DEFAULT_TF_VERSION := 2.9.3
32+
TF_VERSIONS := 2.9.3 2.9.2 2.9.1 2.9.0 2.8.4 2.8.3 2.8.2 2.8.1 2.8.0 2.7.4 2.7.3 2.7.2 2.7.1 2.7.0 2.6.5 2.6.4 2.6.3 2.6.2 2.6.1 2.6.0 2.5.3 2.5.2 2.5.1 2.5.0 2.4.4 2.4.3 2.4.2 2.4.1 2.4.0 2.3.4 2.3.3 2.3.2 2.3.1 2.3.0 2.2.3 2.2.2 2.2.1 2.2.0 2.1.4 2.1.3 2.1.2 2.1.1 2.1.0 2.0.4 2.0.3 2.0.2 2.0.1 2.0.0
2933
DEFAULT_JOBS := $(shell nproc)
3034
DEFAULT_GPU := 1
31-
DEFAULT_ARCH := $(shell dpkg --print-architecture)
35+
ifeq ($(ARCH), arm64)
36+
DEFAULT_TF_CUDA_COMPUTE_CAPABILITIES := 5.3,6.0,6.1,7.0,7.2,7.5,8.0,8.6,8.7
37+
else
38+
DEFAULT_TF_CUDA_COMPUTE_CAPABILITIES := 5.3,6.0,6.1,7.0,7.2,7.5,8.0,8.6
39+
endif
3240

3341
# arguments
3442
TF_VERSION := $(if $(TF_VERSION),$(TF_VERSION),$(DEFAULT_TF_VERSION))
3543
JOBS := $(if $(JOBS),$(JOBS),$(DEFAULT_JOBS))
3644
GPU := $(if $(GPU),$(GPU),$(DEFAULT_GPU))
37-
ARCH := $(if $(ARCH),$(ARCH),$(DEFAULT_ARCH))
45+
TF_CUDA_COMPUTE_CAPABILITIES := $(if $(TF_CUDA_COMPUTE_CAPABILITIES),$(TF_CUDA_COMPUTE_CAPABILITIES),$(DEFAULT_TF_CUDA_COMPUTE_CAPABILITIES))
3846

3947
# variables
4048
ifeq ($(GPU), 1)

‎README.md‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ docker run --rm \
4242
rwthika/tensorflow-cc:latest \
4343
./build-and-run.sh
4444

45-
# Hello from TensorFlow C++ 2.9.2!
45+
# Hello from TensorFlow C++ 2.9.3!
4646
#
4747
# A =
4848
# 1 2
@@ -65,16 +65,16 @@ The pre-built `libtensorflow_cc.so` library and accompanying headers are package
6565
#### GPU
6666

6767
```bash
68-
wget https://github.com/ika-rwth-aachen/libtensorflow_cc/releases/download/v2.9.2/libtensorflow-cc_2.9.2-gpu_$(dpkg --print-architecture).deb
69-
sudo dpkg -i libtensorflow-cc_2.9.2-gpu_$(dpkg --print-architecture).deb
68+
wget https://github.com/ika-rwth-aachen/libtensorflow_cc/releases/download/v2.9.3/libtensorflow-cc_2.9.3-gpu_$(dpkg --print-architecture).deb
69+
sudo dpkg -i libtensorflow-cc_2.9.3-gpu_$(dpkg --print-architecture).deb
7070
ldconfig
7171
```
7272

7373
#### CPU
7474

7575
```bash
76-
wget https://github.com/ika-rwth-aachen/libtensorflow_cc/releases/download/v2.9.2/libtensorflow-cc_2.9.2_$(dpkg --print-architecture).deb
77-
sudo dpkg -i libtensorflow-cc_2.9.2_$(dpkg --print-architecture).deb
76+
wget https://github.com/ika-rwth-aachen/libtensorflow_cc/releases/download/v2.9.3/libtensorflow-cc_2.9.3_$(dpkg --print-architecture).deb
77+
sudo dpkg -i libtensorflow-cc_2.9.3_$(dpkg --print-architecture).deb
7878
ldconfig
7979
```
8080

@@ -101,18 +101,20 @@ The amd64 images are based on the [official TensorFlow Docker images](https://hu
101101

102102
| TensorFlow Version | CPU/GPU | Architecture | Image:Tag |
103103
| :---: | :---: | :---: | --- |
104-
| 2.9.2 | GPU | amd64, arm64 | `rwthika/tensorflow-cc:latest-gpu` |
105-
| 2.9.2 | CPU | amd64, arm64 | `rwthika/tensorflow-cc:latest` |
104+
| 2.9.3 | GPU | amd64, arm64 | `rwthika/tensorflow-cc:latest-gpu` |
105+
| 2.9.3 | CPU | amd64, arm64 | `rwthika/tensorflow-cc:latest` |
106106

107107
<details>
108108
<summary><i>All TensorFlow Versions (GPU)</i></summary>
109109

110110
| TensorFlow Version | Architecture | Image:Tag |
111111
| :---: | :---: | --- |
112112
| latest | amd64, arm64 | `rwthika/tensorflow-cc:latest-gpu` |
113+
| 2.9.3 | amd64, arm64 | `rwthika/tensorflow-cc:2.9.3-gpu` |
113114
| 2.9.2 | amd64, arm64 | `rwthika/tensorflow-cc:2.9.2-gpu` |
114115
| 2.9.1 | amd64 | `rwthika/tensorflow-cc:2.9.1-gpu` |
115116
| 2.9.0 | amd64 | `rwthika/tensorflow-cc:2.9.0-gpu` |
117+
| 2.8.4 | amd64, arm64 | `rwthika/tensorflow-cc:2.8.4-gpu` |
116118
| 2.8.3 | amd64 | `rwthika/tensorflow-cc:2.8.3-gpu` |
117119
| 2.8.2 | amd64 | `rwthika/tensorflow-cc:2.8.2-gpu` |
118120
| 2.8.1 | amd64 | `rwthika/tensorflow-cc:2.8.1-gpu` |
@@ -131,9 +133,11 @@ The amd64 images are based on the [official TensorFlow Docker images](https://hu
131133
| TensorFlow Version | Architecture | Image:Tag |
132134
| :---: | :---: | --- |
133135
| latest | amd64, arm64 | `rwthika/tensorflow-cc:latest` |
136+
| 2.9.3 | amd64, arm64 | `rwthika/tensorflow-cc:2.9.3` |
134137
| 2.9.2 | amd64, arm64 | `rwthika/tensorflow-cc:2.9.2` |
135138
| 2.9.1 | amd64 | `rwthika/tensorflow-cc:2.9.1` |
136139
| 2.9.0 | amd64 | `rwthika/tensorflow-cc:2.9.0` |
140+
| 2.8.4 | amd64, arm64 | `rwthika/tensorflow-cc:2.8.4` |
137141
| 2.8.3 | amd64 | `rwthika/tensorflow-cc:2.8.3` |
138142
| 2.8.2 | amd64 | `rwthika/tensorflow-cc:2.8.2` |
139143
| 2.8.1 | amd64 | `rwthika/tensorflow-cc:2.8.1` |
@@ -168,7 +172,7 @@ The amd64 images are based on the [official TensorFlow Docker images](https://hu
168172

169173
If you would like to build the deb-package and Docker images yourself, use the [`Makefile`](Makefile) as instructed below.
170174

171-
All `make` targets support the flags `TF_VERSION` (defaults to `2.9.2`), `GPU` (defaults to `1`), and `ARCH` (defaults to host architecture) in order to build a specific TensorFlow version in CPU/GPU mode for a specific architecture.
175+
All `make` targets support the flags `TF_VERSION` (defaults to `2.9.3`), `GPU` (defaults to `1`), and `ARCH` (defaults to host architecture) in order to build a specific TensorFlow version in CPU/GPU mode for a specific architecture.
172176

173177
All `make` targets listed below also have a counterpart named `<target>-all`, which can be used to build multiple TensorFlow versions one after the other using the `TF_VERSIONS` flag like so:
174178

@@ -232,10 +236,14 @@ make 5-print-versions
232236

233237
| Version | Architecture | Step 1 (CPU) | Step 2 (CPU) | Step 4 (CPU) | Step 1 (GPU) | Step 2 (GPU) | Step 4 (GPU) | Notes |
234238
| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | --- |
239+
| 2.9.3 | amd64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
240+
| 2.9.3 | arm64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
235241
| 2.9.2 | amd64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
236242
| 2.9.2 | arm64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
237243
| 2.9.1 | amd64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
238244
| 2.9.0 | amd64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
245+
| 2.8.4 | amd64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
246+
| 2.8.4 | arm64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
239247
| 2.8.3 | amd64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
240248
| 2.8.2 | amd64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
241249
| 2.8.1 | amd64 | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | |
@@ -290,10 +298,14 @@ make 5-print-versions
290298

291299
| TensorFlow | Architecture | Ubuntu | GCC | Bazel | Python | protobuf | CUDA | cuDNN | TensorRT | GPU Compute Capability |
292300
| --- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
293-
| 2.9.2 | amd64 | 20.04 | 9.4.0 | 5.3.1 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.7, 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
301+
| 2.9.3 | amd64 | 20.04 | 9.4.0 | 6.0.0 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
302+
| 2.9.3 | arm64 | 20.04 | 9.4.0 | 6.0.0 | 3.8.10 | 3.9.2 | 11.4.239 | 8.4.1 | 8.4.1 | 8.7, 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
303+
| 2.9.2 | amd64 | 20.04 | 9.4.0 | 5.3.1 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
294304
| 2.9.2 | arm64 | 20.04 | 9.4.0 | 5.3.2 | 3.8.10 | 3.9.2 | 11.4.239 | 8.4.1 | 8.4.1 | 8.7, 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
295305
| 2.9.1 | amd64 | 20.04 | 9.4.0 | 5.3.0 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
296306
| 2.9.0 | amd64 | 20.04 | 9.4.0 | 5.3.0 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
307+
| 2.8.4 | amd64 | 20.04 | 9.4.0 | 4.2.1 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
308+
| 2.8.4 | amd64 | 20.04 | 9.4.0 | 4.2.1 | 3.8.10 | 3.9.2 | 11.4.166 | 8.3.2 | 8.4.0 | 8.7, 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
297309
| 2.8.3 | amd64 | 20.04 | 9.4.0 | 4.2.1 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
298310
| 2.8.2 | amd64 | 20.04 | 9.4.0 | 4.2.1 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |
299311
| 2.8.1 | amd64 | 20.04 | 9.4.0 | 4.2.1 | 3.8.10 | 3.9.2 | 11.2.152 | 8.1.0 | 7.2.2 | 8.6, 8.0, 7.5, 7.2, 7.0, 6.1, 6.0, 5.3 |

‎docker/Dockerfile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,32 @@
2121
# --- build stage for building libtensorflow_cc --------------------------------
2222
ARG TF_VERSION=master
2323
ARG GPU_POSTFIX=-gpu
24+
ARG TF_CUDA_COMPUTE_CAPABILITIES=5.3,6.0,6.1,7.0,7.2,7.5,8.0,8.6
2425
ARG TARGETARCH
2526
FROM tensorflow/tensorflow:${TF_VERSION}-devel${GPU_POSTFIX}-${TARGETARCH} as build
2627

2728
ARG TARGETARCH
2829
ARG TF_VERSION
2930
ARG GPU_POSTFIX
31+
ARG TF_CUDA_COMPUTE_CAPABILITIES
3032
ARG JOBS="auto"
3133

3234
# clone TensorFlow
3335
RUN git clone --branch v${TF_VERSION} --depth=1 https://github.com/tensorflow/tensorflow.git /tensorflow
3436
WORKDIR /tensorflow
3537

38+
# fix build issue in v2.10.0
39+
# https://github.com/tensorflow/tensorflow/issues/57826
40+
RUN if [ "${TF_VERSION}" = "2.10.0" ] || [ "${TF_VERSION}" = "2.10.1" ]; then \
41+
git fetch --depth=1 origin b1bd1d6beeac169ce669f81dcbf3c48899ca1ed0 && \
42+
git checkout FETCH_HEAD -- tensorflow/BUILD; \
43+
fi
44+
3645
# configure compilation
3746
ENV PYTHON_BIN_PATH=/usr/bin/python3
3847
ENV PYTHON_LIB_PATH=/usr/lib/python3/dist-packages
3948
ENV TF_NEED_ROCM=0
40-
ENV TF_CUDA_COMPUTE_CAPABILITIES=5.3,6.0,6.1,7.0,7.2,7.5,8.0,8.6,8.7
49+
ENV TF_CUDA_COMPUTE_CAPABILITIES=${TF_CUDA_COMPUTE_CAPABILITIES}
4150
ENV TF_CUDA_CLANG=0
4251
ENV GCC_HOST_COMPILER_PATH=/usr/bin/gcc
4352
ENV CC_OPT_FLAGS="-march=native -Wno-sign-compare"
@@ -53,7 +62,8 @@ RUN if [ "${GPU_POSTFIX}" = "-gpu" ]; then \
5362

5463
# move libtensorflow_cc to separate folder for easier Dockerfile COPY
5564
RUN mkdir bazel-bin/tensorflow/lib && \
56-
mv bazel-bin/tensorflow/libtensorflow_cc.so* bazel-bin/tensorflow/lib/
65+
mv bazel-bin/tensorflow/libtensorflow_cc.so* bazel-bin/tensorflow/lib/ && \
66+
rm bazel-bin/tensorflow/lib/*params
5767

5868
# build protobuf from source, same version as TensorFlow is using
5969
WORKDIR /

‎scripts/.common.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
set -e
2222
set -o pipefail
2323

24-
DEFAULT_TF_VERSION="2.9.2"
24+
DEFAULT_TF_VERSION="2.9.3"
2525
DEFAULT_JOBS=$(nproc)
2626
DEFAULT_GPU=1
2727
DEFAULT_ARCH=$(dpkg --print-architecture)
@@ -32,6 +32,13 @@ GPU=${GPU:-${DEFAULT_GPU}}
3232
[[ $GPU == "1" ]] && GPU_POSTFIX="-gpu" || GPU_POSTFIX=""
3333
ARCH=${ARCH:-${DEFAULT_ARCH}}
3434

35+
if [ "$ARCH" = "arm64" ]; then
36+
DEFAULT_TF_CUDA_COMPUTE_CAPABILITIES=5.3,6.0,6.1,7.0,7.2,7.5,8.0,8.6,8.7
37+
else
38+
DEFAULT_TF_CUDA_COMPUTE_CAPABILITIES=5.3,6.0,6.1,7.0,7.2,7.5,8.0,8.6
39+
fi
40+
TF_CUDA_COMPUTE_CAPABILITIES=${TF_CUDA_COMPUTE_CAPABILITIES:-${DEFAULT_TF_CUDA_COMPUTE_CAPABILITIES}}
41+
3542
SCRIPT_NAME=$(basename "$0")
3643
SCRIPT_DIR=$(realpath $(dirname "$0"))
3744
REPOSITORY_DIR=$(realpath ${SCRIPT_DIR}/..)

‎scripts/.versions.devel.sh‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,30 @@ if [[ $(command -v bazel) ]]; then
2929
BAZEL_VERSION=$(bazel version 2> /dev/null | grep "Build label" | awk '{print $3}')
3030
fi
3131

32+
if [[ $(command -v nvcc) ]]; then
33+
CUDA_VERSION=$(nvcc --version | grep ^Cuda | awk '{print $6}' | sed 's/V//')
34+
fi
35+
36+
if [[ -f /usr/include/cudnn_version.h ]]; then
37+
CUDNN_MAJOR=$(cat /usr/include/cudnn_version.h | grep "#define CUDNN_MAJOR" | sed "s/#define CUDNN_MAJOR //")
38+
CUDNN_MINOR=$(cat /usr/include/cudnn_version.h | grep "#define CUDNN_MINOR" | sed "s/#define CUDNN_MINOR //")
39+
CUDNN_PATCH=$(cat /usr/include/cudnn_version.h | grep "#define CUDNN_PATCHLEVEL" | sed "s/#define CUDNN_PATCHLEVEL //")
40+
CUDNN_VERSION=$CUDNN_MAJOR.$CUDNN_MINOR.$CUDNN_PATCH
41+
fi
42+
43+
if [[ -f /usr/include/$(uname -m)-linux-gnu/NvInferVersion.h ]]; then
44+
TENSORRT_MAJOR=$(cat /usr/include/$(uname -m)-linux-gnu/NvInferVersion.h | grep "#define NV_TENSORRT_MAJOR" | sed "s/#define NV_TENSORRT_MAJOR //" | sed "s#//.*##" | sed "s/ //")
45+
TENSORRT_MINOR=$(cat /usr/include/$(uname -m)-linux-gnu/NvInferVersion.h | grep "#define NV_TENSORRT_MINOR" | sed "s/#define NV_TENSORRT_MINOR //" | sed "s#//.*##" | sed "s/ //")
46+
TENSORRT_PATCH=$(cat /usr/include/$(uname -m)-linux-gnu/NvInferVersion.h | grep "#define NV_TENSORRT_PATCH" | sed "s/#define NV_TENSORRT_PATCH //" | sed "s#//.*##" | sed "s/ //")
47+
TENSORRT_VERSION=$TENSORRT_MAJOR.$TENSORRT_MINOR.$TENSORRT_PATCH
48+
fi
49+
3250
cat << EOF
3351
Architecture: $ARCH
3452
Ubuntu: $UBUNTU_VERSION
3553
GCC: $GCC_VERSION
3654
Bazel: $BAZEL_VERSION
55+
CUDA: $CUDA_VERSION
56+
cuDNN: $CUDNN_VERSION
57+
TensorRT: $TENSORRT_VERSION
3758
EOF

‎scripts/.versions.run.sh‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,9 @@ if [[ $(command -v protoc) ]]; then
3636
PROTOBUF_VERSION=$(protoc --version | awk '{print $2}')
3737
fi
3838

39-
if [[ $(command -v nvcc) ]]; then
40-
CUDA_VERSION=$(nvcc --version | grep ^Cuda | awk '{print $6}' | sed 's/V//')
41-
fi
42-
43-
if [[ -f /usr/include/cudnn_version.h ]]; then
44-
CUDNN_MAJOR=$(cat /usr/include/cudnn_version.h | grep "#define CUDNN_MAJOR" | sed "s/#define CUDNN_MAJOR //")
45-
CUDNN_MINOR=$(cat /usr/include/cudnn_version.h | grep "#define CUDNN_MINOR" | sed "s/#define CUDNN_MINOR //")
46-
CUDNN_PATCH=$(cat /usr/include/cudnn_version.h | grep "#define CUDNN_PATCHLEVEL" | sed "s/#define CUDNN_PATCHLEVEL //")
47-
CUDNN_VERSION=$CUDNN_MAJOR.$CUDNN_MINOR.$CUDNN_PATCH
48-
fi
49-
50-
if [[ -f /usr/include/$(uname -m)-linux-gnu/NvInferVersion.h ]]; then
51-
TENSORRT_MAJOR=$(cat /usr/include/$(uname -m)-linux-gnu/NvInferVersion.h | grep "#define NV_TENSORRT_MAJOR" | sed "s/#define NV_TENSORRT_MAJOR //" | sed "s#//.*##" | sed "s/ //")
52-
TENSORRT_MINOR=$(cat /usr/include/$(uname -m)-linux-gnu/NvInferVersion.h | grep "#define NV_TENSORRT_MINOR" | sed "s/#define NV_TENSORRT_MINOR //" | sed "s#//.*##" | sed "s/ //")
53-
TENSORRT_PATCH=$(cat /usr/include/$(uname -m)-linux-gnu/NvInferVersion.h | grep "#define NV_TENSORRT_PATCH" | sed "s/#define NV_TENSORRT_PATCH //" | sed "s#//.*##" | sed "s/ //")
54-
TENSORRT_VERSION=$TENSORRT_MAJOR.$TENSORRT_MINOR.$TENSORRT_PATCH
55-
fi
56-
5739
cat << EOF
5840
Python: $PYTHON_VERSION
5941
TensorFlow (Python): $TENSORFLOW_PYTHON_VERSION
6042
TensorFlow (C++): $TENSORFLOW_CPP_VERSION
6143
protobuf: $PROTOBUF_VERSION
62-
CUDA: $CUDA_VERSION
63-
cuDNN: $CUDNN_VERSION
64-
TensorRT: $TENSORRT_VERSION
6544
EOF

‎scripts/1-build-official-devel-image.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ if [ "$ARCH" = "amd64" ]; then
2626
DOCKERFILE=${DOWNLOAD_DOCKERFILE_DIR}/dockerfiles/devel${CPU_GPU_POSTFIX}.Dockerfile
2727
elif [ "$ARCH" = "arm64" ]; then
2828
DOCKERFILE=${DOWNLOAD_DOCKERFILE_DIR}/dockerfiles/arm64v8/devel-cpu-arm64v8.Dockerfile
29-
sed -i "s/ubuntu:\${UBUNTU_VERSION}/nvcr.io\/nvidia\/l4t-tensorflow:r35.1.0-tf2.9-py3/" $DOCKERFILE
29+
if [ "$TF_VERSION" = "2.8.4" ]; then
30+
sed -i "s/ubuntu:\${UBUNTU_VERSION}/nvcr.io\/nvidia\/l4t-tensorflow:r34.1.1-tf2.8-py3/" $DOCKERFILE
31+
else
32+
sed -i "s/ubuntu:\${UBUNTU_VERSION}/nvcr.io\/nvidia\/l4t-tensorflow:r35.1.0-tf2.9-py3/" $DOCKERFILE
33+
fi
3034
fi
3135
BUILD_DIR=${DOWNLOAD_DOCKERFILE_DIR}
3236

‎scripts/2-build-cpp-image.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@
2222
source $(dirname "$0")/.common.sh
2323

2424
echo "Building ${IMAGE_CPP} ... "
25-
docker build --build-arg TARGETARCH=$ARCH --build-arg TF_VERSION=${TF_VERSION} --build-arg JOBS=${JOBS} --build-arg GPU_POSTFIX=${GPU_POSTFIX} -t ${IMAGE_CPP_ARCH} ${DOCKER_DIR} | tee ${LOG_FILE}
25+
docker build --build-arg TARGETARCH=$ARCH --build-arg TF_VERSION=${TF_VERSION} --build-arg JOBS=${JOBS} --build-arg GPU_POSTFIX=${GPU_POSTFIX} --build-arg TF_CUDA_COMPUTE_CAPABILITIES=${TF_CUDA_COMPUTE_CAPABILITIES} -t ${IMAGE_CPP_ARCH} ${DOCKER_DIR} | tee ${LOG_FILE}
2626
docker tag ${IMAGE_CPP_ARCH} ${IMAGE_CPP}

‎scripts/3-export-libtensorflow-cc.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ EXPORT_FILE="libtensorflow-cc_${TF_VERSION}${GPU_POSTFIX}_${ARCH}.deb"
2727
STAGE="deb-package"
2828

2929
echo "Building ${IMAGE_LIBTENSORFLOW_CC_ARCH} ... "
30-
docker build --build-arg TARGETARCH=$ARCH --build-arg TF_VERSION=${TF_VERSION} --build-arg JOBS=${JOBS} --build-arg GPU_POSTFIX=${GPU_POSTFIX} --target ${STAGE} -t ${IMAGE_LIBTENSORFLOW_CC_ARCH} ${DOCKER_DIR} | tee ${LOG_FILE}
30+
docker build --build-arg TARGETARCH=$ARCH --build-arg TF_VERSION=${TF_VERSION} --build-arg JOBS=${JOBS} --build-arg GPU_POSTFIX=${GPU_POSTFIX} --build-arg TF_CUDA_COMPUTE_CAPABILITIES=${TF_CUDA_COMPUTE_CAPABILITIES} --target ${STAGE} -t ${IMAGE_LIBTENSORFLOW_CC_ARCH} ${DOCKER_DIR} | tee ${LOG_FILE}
3131

3232
echo "Exporting to $(realpath ${EXPORT_DIR})/${EXPORT_FILE} ... "
3333
TMP_CONTAINER=$(docker create ${IMAGE_LIBTENSORFLOW_CC_ARCH})

‎scripts/4-test-libtensorflow-cc.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ CMD="./build-and-run.sh"
2727

2828
echo "Testing libtensorflow_cc in ${IMAGE_CPP} ... "
2929
if [[ "$GPU" == "1" && "$ARCH" = "amd64" ]]; then
30-
GPU_ARG = "--gpus all"
30+
GPU_ARG="--gpus all"
3131
elif [[ "$GPU" == "1" && "$ARCH" = "arm64" ]]; then
3232
GPU_ARG="--runtime nvidia"
3333
else

0 commit comments

Comments
 (0)