From 29d3efd03d81c25ffd9c5b6efcc1ab74f53468fa Mon Sep 17 00:00:00 2001 From: stu1130 Date: Mon, 3 Jun 2019 17:23:16 -0700 Subject: [PATCH 1/3] bump up cudnn version --- ci/docker/Dockerfile.build.centos7_gpu | 2 +- ci/docker/Dockerfile.build.ubuntu_base_gpu | 2 +- ci/docker/Dockerfile.build.ubuntu_build_cuda | 2 +- ci/docker/Dockerfile.build.ubuntu_gpu_cu100 | 2 +- ci/docker/Dockerfile.build.ubuntu_gpu_cu90 | 2 +- ci/docker/Dockerfile.build.ubuntu_gpu_cu92 | 2 +- ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt | 2 +- ci/docker/Dockerfile.build.ubuntu_nightly_gpu | 2 +- tools/setup_gpu_build_tools.sh | 8 ++++---- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/docker/Dockerfile.build.centos7_gpu b/ci/docker/Dockerfile.build.centos7_gpu index 0b2464fe8e36..1a927c4d5832 100644 --- a/ci/docker/Dockerfile.build.centos7_gpu +++ b/ci/docker/Dockerfile.build.centos7_gpu @@ -29,7 +29,7 @@ RUN /work/centos7_ccache.sh COPY install/centos7_python.sh /work/ RUN /work/centos7_python.sh -ENV CUDNN_VERSION=7.5.1.10 +ENV CUDNN_VERSION=7.6.0.64 COPY install/centos7_cudnn.sh /work/ RUN /work/centos7_cudnn.sh diff --git a/ci/docker/Dockerfile.build.ubuntu_base_gpu b/ci/docker/Dockerfile.build.ubuntu_base_gpu index 98e3669c8273..40e1da657203 100644 --- a/ci/docker/Dockerfile.build.ubuntu_base_gpu +++ b/ci/docker/Dockerfile.build.ubuntu_base_gpu @@ -25,7 +25,7 @@ WORKDIR /work/deps RUN apt-get update && apt-get -y install sudo -ENV CUDNN_VERSION=7.5.1.10 +ENV CUDNN_VERSION=7.6.0.64 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda index ad1a1c4558b5..0607ec1a5e75 100644 --- a/ci/docker/Dockerfile.build.ubuntu_build_cuda +++ b/ci/docker/Dockerfile.build.ubuntu_build_cuda @@ -44,7 +44,7 @@ RUN /work/ubuntu_clang.sh COPY install/ubuntu_mklml.sh /work/ RUN /work/ubuntu_mklml.sh -ENV CUDNN_VERSION=7.5.1.10 +ENV CUDNN_VERSION=7.6.0.64 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 index 7c93ebeffed3..46d27e35022b 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu100 @@ -67,7 +67,7 @@ RUN /work/ubuntu_docs.sh COPY install/ubuntu_tutorials.sh /work/ RUN /work/ubuntu_tutorials.sh -ENV CUDNN_VERSION=7.5.1.10 +ENV CUDNN_VERSION=7.6.0.64 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 index add1f73f7c86..19530a212424 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu90 @@ -67,7 +67,7 @@ RUN /work/ubuntu_docs.sh COPY install/ubuntu_tutorials.sh /work/ RUN /work/ubuntu_tutorials.sh -ENV CUDNN_VERSION=7.5.1.10 +ENV CUDNN_VERSION=7.6.0.64 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 index cd01c5996273..f239eec4af27 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu92 @@ -67,7 +67,7 @@ RUN /work/ubuntu_docs.sh COPY install/ubuntu_tutorials.sh /work/ RUN /work/ubuntu_tutorials.sh -ENV CUDNN_VERSION=7.5.1.10 +ENV CUDNN_VERSION=7.6.0.64 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt b/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt index 09591ee0b9c9..f5f90c4e9d51 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt @@ -35,7 +35,7 @@ ARG USER_ID=0 COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh -ENV CUDNN_VERSION=7.5.0.56 +ENV CUDNN_VERSION=7.6.0.64 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu index 48b562584914..a667f7b7a94f 100644 --- a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu +++ b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu @@ -70,7 +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 +ENV CUDNN_VERSION=7.6.0.64 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh diff --git a/tools/setup_gpu_build_tools.sh b/tools/setup_gpu_build_tools.sh index a4cd2b431f3c..122fcd9a9a2c 100755 --- a/tools/setup_gpu_build_tools.sh +++ b/tools/setup_gpu_build_tools.sh @@ -31,19 +31,19 @@ if [[ $VARIANT == cu101* ]]; then CUDA_VERSION='10.1.105-1' CUDA_PATCH_VERSION='10.1.105-1' LIBCUDA_VERSION='418.39-0ubuntu1' - LIBCUDNN_VERSION='7.5.1.10-1+cuda10.1' + LIBCUDNN_VERSION='7.6.0.64-1+cuda10.1' LIBNCCL_VERSION='2.4.2-1+cuda10.1' elif [[ $VARIANT == cu100* ]]; then CUDA_VERSION='10.0.130-1' CUDA_PATCH_VERSION='10.0.130-1' LIBCUDA_VERSION='410.48-0ubuntu1' - LIBCUDNN_VERSION='7.5.1.10-1+cuda10.0' + LIBCUDNN_VERSION='7.6.0.64-1+cuda10.0' LIBNCCL_VERSION='2.4.2-1+cuda10.0' elif [[ $VARIANT == cu92* ]]; then CUDA_VERSION='9.2.148-1' CUDA_PATCH_VERSION='9.2.148.1-1' LIBCUDA_VERSION='396.44-0ubuntu1' - LIBCUDNN_VERSION='7.5.1.10-1+cuda9.2' + LIBCUDNN_VERSION='7.6.0.64-1+cuda9.2' LIBNCCL_VERSION='2.4.2-1+cuda9.2' elif [[ $VARIANT == cu91* ]]; then CUDA_VERSION='9.1.85-1' @@ -55,7 +55,7 @@ elif [[ $VARIANT == cu90* ]]; then CUDA_VERSION='9.0.176-1' CUDA_PATCH_VERSION='9.0.176.3-1' LIBCUDA_VERSION='384.145-0ubuntu1' - LIBCUDNN_VERSION='7.5.1.10-1+cuda9.0' + LIBCUDNN_VERSION='7.6.0.64-1+cuda9.0' LIBNCCL_VERSION='2.4.2-1+cuda9.0' elif [[ $VARIANT == cu80* ]]; then CUDA_VERSION='8.0.61-1' From 5288936e2dd1a877a258ce47d361289f954d7189 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Mon, 3 Jun 2019 20:11:44 -0700 Subject: [PATCH 2/3] downgrade tensorRT to 7.5 --- ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt b/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt index f5f90c4e9d51..09591ee0b9c9 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt @@ -35,7 +35,7 @@ ARG USER_ID=0 COPY install/ubuntu_adduser.sh /work/ RUN /work/ubuntu_adduser.sh -ENV CUDNN_VERSION=7.6.0.64 +ENV CUDNN_VERSION=7.5.0.56 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh From eb78eacc43b47e802f5922e74fa2b8f79a555fdf Mon Sep 17 00:00:00 2001 From: stu1130 Date: Thu, 13 Jun 2019 14:20:25 -0700 Subject: [PATCH 3/3] bump up NCCL 2.4.7 --- tools/setup_gpu_build_tools.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/setup_gpu_build_tools.sh b/tools/setup_gpu_build_tools.sh index 122fcd9a9a2c..724af3c90ec1 100755 --- a/tools/setup_gpu_build_tools.sh +++ b/tools/setup_gpu_build_tools.sh @@ -32,19 +32,19 @@ if [[ $VARIANT == cu101* ]]; then CUDA_PATCH_VERSION='10.1.105-1' LIBCUDA_VERSION='418.39-0ubuntu1' LIBCUDNN_VERSION='7.6.0.64-1+cuda10.1' - LIBNCCL_VERSION='2.4.2-1+cuda10.1' + LIBNCCL_VERSION='2.4.7-1+cuda10.1' elif [[ $VARIANT == cu100* ]]; then CUDA_VERSION='10.0.130-1' CUDA_PATCH_VERSION='10.0.130-1' LIBCUDA_VERSION='410.48-0ubuntu1' LIBCUDNN_VERSION='7.6.0.64-1+cuda10.0' - LIBNCCL_VERSION='2.4.2-1+cuda10.0' + LIBNCCL_VERSION='2.4.7-1+cuda10.0' elif [[ $VARIANT == cu92* ]]; then CUDA_VERSION='9.2.148-1' CUDA_PATCH_VERSION='9.2.148.1-1' LIBCUDA_VERSION='396.44-0ubuntu1' LIBCUDNN_VERSION='7.6.0.64-1+cuda9.2' - LIBNCCL_VERSION='2.4.2-1+cuda9.2' + LIBNCCL_VERSION='2.4.7-1+cuda9.2' elif [[ $VARIANT == cu91* ]]; then CUDA_VERSION='9.1.85-1' CUDA_PATCH_VERSION='9.1.85.3-1' @@ -56,7 +56,7 @@ elif [[ $VARIANT == cu90* ]]; then CUDA_PATCH_VERSION='9.0.176.3-1' LIBCUDA_VERSION='384.145-0ubuntu1' LIBCUDNN_VERSION='7.6.0.64-1+cuda9.0' - LIBNCCL_VERSION='2.4.2-1+cuda9.0' + LIBNCCL_VERSION='2.4.7-1+cuda9.0' elif [[ $VARIANT == cu80* ]]; then CUDA_VERSION='8.0.61-1' CUDA_PATCH_VERSION='8.0.61.2-1'