From 87fe8b122f80c3815827a666daa815afa01c509f Mon Sep 17 00:00:00 2001 From: stu1130 Date: Wed, 15 May 2019 17:20:59 -0700 Subject: [PATCH] merge the conflict --- ci/docker/Dockerfile.build.ubuntu_gpu_cu100 | 3 --- ci/docker/Dockerfile.build.ubuntu_gpu_cu90 | 3 --- ci/docker/Dockerfile.build.ubuntu_gpu_cu92 | 3 --- 3 files changed, 9 deletions(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 index c9158725a773..c9908a5eda4e 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 @@ -77,12 +77,9 @@ ARG GROUP_ID=0 COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh -<<<<<<< HEAD -======= ENV CUDNN_VERSION=7.5.1.10 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh ->>>>>>> remove the duplicate one COPY runtime_functions.sh /work/ diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 index 2911776f6484..16e8d998393a 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 @@ -77,13 +77,10 @@ ARG GROUP_ID=0 COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh -<<<<<<< HEAD -======= ENV CUDNN_VERSION=7.5.1.10 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh ->>>>>>> remove the duplicate one COPY runtime_functions.sh /work/ WORKDIR /work/mxnet diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 index edbe040669ea..1618e68693e7 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 @@ -76,13 +76,10 @@ ARG GROUP_ID=0 COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh -<<<<<<< HEAD -======= ENV CUDNN_VERSION=7.5.1.10 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh ->>>>>>> remove the duplicate one COPY runtime_functions.sh /work/ WORKDIR /work/mxnet