Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Clean up duplicate cudnn installation #14996

Merged
merged 1 commit into from
May 20, 2019
Merged

Clean up duplicate cudnn installation #14996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ci/docker/Dockerfile.build.ubuntu_base_gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@

FROM nvidia/cuda:10.0-devel-ubuntu16.04

ENV CUDNN_VERSION=7.5.1.10

WORKDIR /work/deps

RUN apt-get update && apt-get -y install sudo

ENV CUDNN_VERSION=7.3.1.20
ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

Expand Down
4 changes: 2 additions & 2 deletions ci/docker/Dockerfile.build.ubuntu_build_cuda
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

FROM nvidia/cuda:10.0-devel-ubuntu16.04

ENV CUDNN_VERSION=7.5.1.10

WORKDIR /work/deps

COPY install/ubuntu_core.sh /work/
Expand All @@ -45,6 +43,8 @@ COPY install/ubuntu_clang.sh /work/
RUN /work/ubuntu_clang.sh
COPY install/ubuntu_mklml.sh /work/
RUN /work/ubuntu_mklml.sh

ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

Expand Down
6 changes: 1 addition & 5 deletions ci/docker/Dockerfile.build.ubuntu_gpu_cu100
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN /work/ubuntu_docs.sh
COPY install/ubuntu_tutorials.sh /work/
RUN /work/ubuntu_tutorials.sh

ENV CUDNN_VERSION=7.3.1.20
ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

Expand All @@ -77,10 +77,6 @@ ARG GROUP_ID=0
COPY install/ubuntu_adduser.sh /work/
RUN /work/ubuntu_adduser.sh

ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

COPY runtime_functions.sh /work/

WORKDIR /work/mxnet
6 changes: 1 addition & 5 deletions ci/docker/Dockerfile.build.ubuntu_gpu_cu90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN /work/ubuntu_docs.sh
COPY install/ubuntu_tutorials.sh /work/
RUN /work/ubuntu_tutorials.sh

ENV CUDNN_VERSION=7.3.1.20
ENV CUDNN_VERSION=7.5.1.20
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

Expand All @@ -77,10 +77,6 @@ ARG GROUP_ID=0
COPY install/ubuntu_adduser.sh /work/
RUN /work/ubuntu_adduser.sh

ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

COPY runtime_functions.sh /work/

WORKDIR /work/mxnet
Expand Down
6 changes: 1 addition & 5 deletions ci/docker/Dockerfile.build.ubuntu_gpu_cu92
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ RUN /work/ubuntu_docs.sh
COPY install/ubuntu_tutorials.sh /work/
RUN /work/ubuntu_tutorials.sh

ENV CUDNN_VERSION=7.3.1.20
ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

Expand All @@ -76,10 +76,6 @@ ARG GROUP_ID=0
COPY install/ubuntu_adduser.sh /work/
RUN /work/ubuntu_adduser.sh

ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

COPY runtime_functions.sh /work/

WORKDIR /work/mxnet
Expand Down
3 changes: 1 addition & 2 deletions ci/docker/Dockerfile.build.ubuntu_nightly_gpu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@

FROM nvidia/cuda:10.0-devel-ubuntu16.04

ENV CUDNN_VERSION=7.5.1.10

WORKDIR /work/deps

COPY install/ubuntu_core.sh /work/
Expand Down Expand Up @@ -72,6 +70,7 @@ RUN /work/ubuntu_tutorials.sh
COPY install/ubuntu_nightly_tests.sh /work/
RUN /work/ubuntu_nightly_tests.sh

ENV CUDNN_VERSION=7.5.1.10
COPY install/ubuntu_cudnn.sh /work/
RUN /work/ubuntu_cudnn.sh

Expand Down