From efbb55ae360e2ffdd3a75a4f00ad247dec0a93a0 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Thu, 1 Apr 2021 21:17:57 +0000 Subject: [PATCH 1/2] remove cuda compat --- ci/docker/Dockerfile.build.ubuntu_gpu_cu102 | 7 ------- ci/docker/Dockerfile.build.ubuntu_gpu_cu110 | 7 ------- ci/docker/Dockerfile.build.ubuntu_gpu_cu112 | 3 --- 3 files changed, 17 deletions(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 index 845a58d3ddf8..a5489edf265f 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 @@ -69,10 +69,6 @@ ENV CUDNN_VERSION=8.0.4.30 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh -# update the cuda compatibity package because cd host uses nvidia driver 460 -RUN apt-get update && apt-get install -y cuda-compat-11-2 -RUN ln -sfn /usr/local/cuda-11.2 /usr/local/cuda - # Always last ARG USER_ID=0 ARG GROUP_ID=0 @@ -80,6 +76,3 @@ COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh COPY runtime_functions.sh /work/ - -WORKDIR /work/mxnet -ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/cuda/compat diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 index db5138b11a61..267a4d522f5f 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 @@ -32,10 +32,6 @@ COPY install/ubuntu_python.sh /work/ COPY install/requirements /work/ RUN /work/ubuntu_python.sh -# update the cuda compatibity package because cd host uses nvidia driver 460 -RUN apt-get update && apt-get install -y cuda-compat-11-2 -RUN ln -sfn /usr/local/cuda-11.2 /usr/local/cuda - # Always last ARG USER_ID=0 ARG GROUP_ID=0 @@ -43,6 +39,3 @@ COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh COPY runtime_functions.sh /work/ - -WORKDIR /work/mxnet -ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/cuda/compat diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu112 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu112 index 7fe0bceb6128..bc7b4c84bcf1 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu112 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu112 @@ -39,6 +39,3 @@ COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh COPY runtime_functions.sh /work/ - -WORKDIR /work/mxnet -ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/cuda/compat From bf677aa69649a207a56e0c0f2b321ff420f90d93 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Thu, 1 Apr 2021 22:58:19 +0000 Subject: [PATCH 2/2] add back ci/docker/ --- ci/docker/Dockerfile.build.ubuntu_gpu_cu102 | 2 ++ ci/docker/Dockerfile.build.ubuntu_gpu_cu110 | 2 ++ ci/docker/Dockerfile.build.ubuntu_gpu_cu112 | 2 ++ 3 files changed, 6 insertions(+) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 index a5489edf265f..b0963060402e 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 @@ -76,3 +76,5 @@ COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh COPY runtime_functions.sh /work/ + +WORKDIR /work/mxnet diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 index 267a4d522f5f..923c06979d39 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 @@ -39,3 +39,5 @@ COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh COPY runtime_functions.sh /work/ + +WORKDIR /work/mxnet diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu112 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu112 index bc7b4c84bcf1..f45ceed73492 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu112 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu112 @@ -39,3 +39,5 @@ COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh COPY runtime_functions.sh /work/ + +WORKDIR /work/mxnet