[incubator-mxnet] branch v1.x updated: [v1.x] Fix nightly cd cu102 (#19940)

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhasheng pushed a commit to branch v1.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git


The following commit(s) were added to refs/heads/v1.x by this push:
     new 3a2c6e9  [v1.x] Fix nightly cd cu102 (#19940)
3a2c6e9 is described below

commit 3a2c6e947b344f3df043db831d9458fca84ca502
Author: Zhaoqi Zhu <zh...@gmail.com>
AuthorDate: Sun Feb 21 09:55:47 2021 -0800

    [v1.x] Fix nightly cd cu102 (#19940)
    
    * attemp to fix docker
    
    * move file to cd
    
    * fix docker image
    
    * Update Dockerfile.build.ubuntu_gpu_cu102
    
    * Update ubuntu_cudnn.sh
    
    * update cudnn to 8 in build stage as well
---
 cd/python/docker/Dockerfile    | 14 +++++++++-----
 tools/setup_gpu_build_tools.sh |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cd/python/docker/Dockerfile b/cd/python/docker/Dockerfile
index ed97bdc..c7a13a4 100644
--- a/cd/python/docker/Dockerfile
+++ b/cd/python/docker/Dockerfile
@@ -23,11 +23,15 @@
 ARG BASE_IMAGE
 FROM ${BASE_IMAGE}
 
-ARG PYTHON_CMD=python3
-RUN apt-get update && \
-    apt-get install -y wget ${PYTHON_CMD}-dev gcc && \
-    wget https://bootstrap.pypa.io/get-pip.py && \
-    ${PYTHON_CMD} get-pip.py
+RUN apt-get update || true
+RUN apt-get install -y software-properties-common
+RUN add-apt-repository -y ppa:deadsnakes/ppa
+RUN apt-get update || true
+RUN apt-get install -y python3.7-dev python3.7-distutils virtualenv wget
+RUN ln -sf /usr/bin/python3.7 /usr/local/bin/python3
+
+RUN wget -nv https://bootstrap.pypa.io/get-pip.py
+RUN python3 get-pip.py
 
 ARG MXNET_COMMIT_ID
 ENV MXNET_COMMIT_ID=${MXNET_COMMIT_ID}
diff --git a/tools/setup_gpu_build_tools.sh b/tools/setup_gpu_build_tools.sh
index 6a50dd5..b2f8041 100755
--- a/tools/setup_gpu_build_tools.sh
+++ b/tools/setup_gpu_build_tools.sh
@@ -42,7 +42,7 @@ elif [[ $VARIANT == cu102* ]]; then
     CUDA_VERSION='10.2.89-1'
     CUDA_PATCH_VERSION='10.2.2.89-1'
     LIBCUDA_VERSION='440.33.01-0ubuntu1'
-    LIBCUDNN_VERSION='7.6.5.32-1+cuda10.2'
+    LIBCUDNN_VERSION='8.0.4.30-1+cuda10.2'
     LIBNCCL_VERSION='2.5.6-1+cuda10.2'
 elif [[ $VARIANT == cu101* ]]; then
     CUDA_VERSION='10.1.105-1'