From 36a19345724b6c4ff3163123963a1271d4d34301 Mon Sep 17 00:00:00 2001
From: Serge Panev <spanev@nvidia.com>
Date: Tue, 28 Jul 2020 18:08:31 -0700
Subject: [PATCH] Add Ubuntu CUDA 10.2 to container and update TRT job

Signed-off-by: Serge Panev <spanev@nvidia.com>
---
 ci/docker/Dockerfile.build.ubuntu | 13 +++++++++++--
 ci/docker/docker-compose.yml      | 10 ++++++++++
 ci/docker/runtime_functions.sh    |  4 +++-
 ci/jenkins/Jenkins_steps.groovy   |  2 +-
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/ci/docker/Dockerfile.build.ubuntu b/ci/docker/Dockerfile.build.ubuntu
index f196828274ce..3babb468f2fe 100644
--- a/ci/docker/Dockerfile.build.ubuntu
+++ b/ci/docker/Dockerfile.build.ubuntu
@@ -50,8 +50,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         build-essential \
         ninja-build \
         git \
-        protobuf-compiler \
-        libprotobuf-dev \
         clang-6.0 \
         clang-tidy-6.0 \
         python-yaml \
@@ -83,6 +81,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         pandoc \
         ## Build-dependencies for ccache 3.7.9
         autoconf \
+        autogen \
+        libtool \
         gperf \
         libb2-dev \
         libzstd-dev && \
@@ -110,6 +110,15 @@ COPY install/requirements /work/
 RUN python3 -m pip install cmake==3.16.6 && \
     python3 -m pip install -r /work/requirements
 
+RUN git clone --recursive -b 3.5.1.1 https://github.com/google/protobuf.git && \
+    cd protobuf && \
+    ./autogen.sh && \
+    ./configure && \
+    make -j$(nproc) install && \
+    cd .. && \
+    rm -rf protobuf && \
+    ldconfig
+
 ARG USER_ID=0
 COPY install/docker_filepermissions.sh /work/
 RUN /work/docker_filepermissions.sh
diff --git a/ci/docker/docker-compose.yml b/ci/docker/docker-compose.yml
index cced098d7f11..865abc128167 100644
--- a/ci/docker/docker-compose.yml
+++ b/ci/docker/docker-compose.yml
@@ -108,6 +108,16 @@ services:
         BASE_IMAGE: nvidia/cuda:10.1-cudnn7-devel-ubuntu18.04
       cache_from:
         - ${DOCKER_CACHE_REGISTRY}/build.ubuntu_gpu_cu101:latest
+  ubuntu_gpu_cu102:
+    image: ${DOCKER_CACHE_REGISTRY}/build.ubuntu_gpu_cu102:latest
+    build:
+      context: .
+      dockerfile: Dockerfile.build.ubuntu
+      target: gpu
+      args:
+        BASE_IMAGE: nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04
+      cache_from:
+        - ${DOCKER_CACHE_REGISTRY}/build.ubuntu_gpu_cu102:latest
   ubuntu_build_cuda:
     image: ${DOCKER_CACHE_REGISTRY}/build.ubuntu_build_cuda:latest
     build:
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 8e3d4f891662..50eed1c5b1f9 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -557,11 +557,13 @@ build_ubuntu_gpu_tensorrt() {
     ninja
     export LIBRARY_PATH=`pwd`:`pwd`/onnx/:$LIBRARY_PATH
     export CPLUS_INCLUDE_PATH=`pwd`:$CPLUS_INCLUDE_PATH
+    mkdir -p /usr/include/x86_64-linux-gnu/onnx
+    cp onnx/onnx*pb.* /usr/include/x86_64-linux-gnu/onnx
     popd
 
     # Build ONNX-TensorRT
     export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib
-    export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}:/usr/local/cuda-10.1/targets/x86_64-linux/include/
+    export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}:/usr/local/cuda-10.2/targets/x86_64-linux/include/
     pushd .
     cd 3rdparty/onnx-tensorrt/
     mkdir -p build
diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy
index 8079420dd794..e2b0b04dea41 100644
--- a/ci/jenkins/Jenkins_steps.groovy
+++ b/ci/jenkins/Jenkins_steps.groovy
@@ -278,7 +278,7 @@ def compile_unix_tensorrt_gpu(lib_name) {
         ws('workspace/build-tensorrt') {
           timeout(time: max_time, unit: 'MINUTES') {
             utils.init_git()
-            utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_tensorrt', false)
+            utils.docker_run('ubuntu_gpu_cu102', 'build_ubuntu_gpu_tensorrt', false)
             utils.pack_lib(lib_name, mx_tensorrt_lib)
           }
         }