From f53b25a2c6b3c1581cd61099272deeeb4637ea52 Mon Sep 17 00:00:00 2001 From: zh-wei Date: Tue, 28 Dec 2021 08:08:30 +0000 Subject: [PATCH] [Docker] Change cuda verion to 10.2 for cmb branch. --- .github/actions/build/build_in_docker.sh | 2 +- .github/workflows/main.yaml | 2 +- ODLA/platforms/tensorrt/CMakeLists.txt | 2 +- utils/docker/Dockerfile | 2 +- utils/docker/build_image.sh | 6 +++--- utils/docker/start_docker_cpu.sh | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/actions/build/build_in_docker.sh b/.github/actions/build/build_in_docker.sh index b4965f218..366181b51 100755 --- a/.github/actions/build/build_in_docker.sh +++ b/.github/actions/build/build_in_docker.sh @@ -1,7 +1,7 @@ #!/bin/bash -xe REPO="registry-intl.us-west-1.aliyuncs.com/computation/halo" -VER="0.7.4" +VER="0.7.3" FLAVOR="devel" MOUNT_DIR="$PWD" diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8d26b87c7..1c40958f4 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -56,7 +56,7 @@ jobs: - name: Build uses: ./halo/.github/actions/build with: - docker_image_variant: cuda11.3.1-cudnn8 + docker_image_variant: cuda10.2-cudnn8 - name: Upload artifacts uses: actions/upload-artifact@v2 diff --git a/ODLA/platforms/tensorrt/CMakeLists.txt b/ODLA/platforms/tensorrt/CMakeLists.txt index 6e1a8f8b0..17987d6fa 100644 --- a/ODLA/platforms/tensorrt/CMakeLists.txt +++ b/ODLA/platforms/tensorrt/CMakeLists.txt @@ -16,7 +16,7 @@ enable_language(CUDA) -set(CUDA_VERSION 11.3 CACHE STRING "Version of CUDA tool-kit.") +set(CUDA_VERSION 10.2 CACHE STRING "Version of CUDA tool-kit.") set(CUDNN_VERSION 7.6 CACHE STRING "Version of Cudnn.") set(CUDA_ROOT /usr/local/cuda-${CUDA_VERSION}/targets/x86_64-linux) find_library(CUDART_LIB NAMES cudart PATHS ${CUDA_ROOT} PATH_SUFFIXES lib NO_DEFAULT_PATH) diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile index 3c190b68f..701d8cc07 100644 --- a/utils/docker/Dockerfile +++ b/utils/docker/Dockerfile @@ -94,7 +94,7 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 6 SHELL ["/bin/bash", "-c"] # Install TensorRT -ARG TENSORRT_VERSION=8.0.3-1+cuda11.3 +ARG TENSORRT_VERSION=8.0.3-1+cuda10.2 RUN if [[ "${BASE_IMAGE}" =~ "nvidia" ]]; then apt-get update -y && \ apt-get install -y --no-install-recommends --allow-change-held-packages \ libnvinfer8=${TENSORRT_VERSION} \ diff --git a/utils/docker/build_image.sh b/utils/docker/build_image.sh index 2245d3dd9..e53fdf103 100755 --- a/utils/docker/build_image.sh +++ b/utils/docker/build_image.sh @@ -1,15 +1,15 @@ #!/bin/bash -xe -VER="0.7.4" +VER="0.7.3" FLAVOR="devel" NAMESPACE="registry-intl.us-west-1.aliyuncs.com/computation" -base_image_gpu="nvidia/cuda:11.3.1-cudnn8-devel-ubuntu18.04" +base_image_gpu="nvidia/cuda:10.2-cudnn8-devel-ubuntu18.04" base_image_cpu="ubuntu:18.04" #docker build --build-arg BASE_IMAGE=${base_image_cpu} \ # -t $NAMESPACE/halo:$VER-$FLAVOR-x86_64-ubuntu18.04 . docker build --build-arg BASE_IMAGE=${base_image_gpu} \ - -t $NAMESPACE/halo:$VER-$FLAVOR-cuda11.3.1-cudnn8-ubuntu18.04 . + -t $NAMESPACE/halo:$VER-$FLAVOR-cuda10.2-cudnn8-ubuntu18.04 . diff --git a/utils/docker/start_docker_cpu.sh b/utils/docker/start_docker_cpu.sh index 1c457707e..bf5e4c16a 100755 --- a/utils/docker/start_docker_cpu.sh +++ b/utils/docker/start_docker_cpu.sh @@ -1,11 +1,11 @@ #!/bin/bash -xe -VER="0.7.4" +VER="0.7.3" FLAVOR="devel" NAMESPACE="registry-intl.us-west-1.aliyuncs.com/computation" if [[ "$0" =~ "start_docker_gpu.sh" ]]; then - IMAGE="$NAMESPACE/halo:$VER-$FLAVOR-cuda11.3.1-cudnn8-ubuntu18.04" + IMAGE="$NAMESPACE/halo:$VER-$FLAVOR-cuda10.2-cudnn8-ubuntu18.04" CONTAINER_NAME=$USER.halo-$VER-GPU docker_run_flag="--runtime=nvidia" else