From d851ac82f46c8d5498fd91cbd88b9685f41ae8ab Mon Sep 17 00:00:00 2001 From: stu1130 Date: Fri, 17 May 2019 10:54:57 -0700 Subject: [PATCH 01/18] bump up the nvidia docker to CUDA 10.1 --- 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_nightly_gpu | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/docker/Dockerfile.build.centos7_gpu b/ci/docker/Dockerfile.build.centos7_gpu index 0b2464fe8e36..0d633a30f937 100644 --- a/ci/docker/Dockerfile.build.centos7_gpu +++ b/ci/docker/Dockerfile.build.centos7_gpu @@ -18,7 +18,7 @@ # # Dockerfile to build and run MXNet on CentOS 7 for GPU -FROM nvidia/cuda:10.0-devel-centos7 +FROM nvidia/cuda:10.1-devel-centos7 WORKDIR /work/deps diff --git a/ci/docker/Dockerfile.build.ubuntu_base_gpu b/ci/docker/Dockerfile.build.ubuntu_base_gpu index 98e3669c8273..de264c49e1f9 100644 --- a/ci/docker/Dockerfile.build.ubuntu_base_gpu +++ b/ci/docker/Dockerfile.build.ubuntu_base_gpu @@ -19,7 +19,7 @@ # Dockerfile to run the MXNet Installation Tests on Ubuntu 16.04 # This should run in an empty docker with ubuntu and cuda. -FROM nvidia/cuda:10.0-devel-ubuntu16.04 +FROM nvidia/cuda:10.1-devel-ubuntu16.04 WORKDIR /work/deps diff --git a/ci/docker/Dockerfile.build.ubuntu_build_cuda b/ci/docker/Dockerfile.build.ubuntu_build_cuda index ad1a1c4558b5..8663d5db96eb 100644 --- a/ci/docker/Dockerfile.build.ubuntu_build_cuda +++ b/ci/docker/Dockerfile.build.ubuntu_build_cuda @@ -21,7 +21,7 @@ # package generation, requiring the actual CUDA library to be # present -FROM nvidia/cuda:10.0-devel-ubuntu16.04 +FROM nvidia/cuda:10.1-devel-ubuntu16.04 WORKDIR /work/deps diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu index 48b562584914..b941e83828c6 100644 --- a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu +++ b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu @@ -18,7 +18,7 @@ # # Dockerfile to run MXNet on Ubuntu 16.04 for CPU -FROM nvidia/cuda:10.0-devel-ubuntu16.04 +FROM nvidia/cuda:10.1-devel-ubuntu16.04 WORKDIR /work/deps From 977343408026d7ad37562da52aa779c1436a4fc6 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Fri, 17 May 2019 11:29:42 -0700 Subject: [PATCH 02/18] change the func name --- ci/docker/runtime_functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 1ad67280617d..81512d32839a 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -587,7 +587,7 @@ build_ubuntu_cpu_mkldnn_mkl() { } build_ubuntu_gpu() { - build_ubuntu_gpu_cuda100_cudnn7 + build_ubuntu_gpu_cuda101_cudnn7 } build_ubuntu_gpu_tensorrt() { @@ -687,7 +687,7 @@ build_ubuntu_gpu_mkldnn_nocudnn() { -j$(nproc) } -build_ubuntu_gpu_cuda100_cudnn7() { +build_ubuntu_gpu_cuda101_cudnn7() { set -ex # unfortunately this build has problems in 3rdparty dependencies with ccache and make # build_ccache_wrappers From f453661109b3e64f7d2de25d4d03de2858eea483 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Fri, 17 May 2019 13:39:59 -0700 Subject: [PATCH 03/18] change the groovy file --- ci/jenkins/Jenkins_steps.groovy | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 668d2f7c7dca..44ce32a7b8c1 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -153,7 +153,7 @@ def compile_unix_int64_gpu() { ws('workspace/build-gpu-int64') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run('ubuntu_gpu_cu100', 'build_ubuntu_gpu_large_tensor', false) + utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_large_tensor', false) utils.pack_lib('ubuntu_gpu_int64', mx_cmake_lib, true) } } @@ -251,7 +251,7 @@ def compile_unix_cmake_mkldnn_gpu() { ws('workspace/build-cmake-mkldnn-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run('ubuntu_gpu_cu100', 'build_ubuntu_gpu_cmake_mkldnn', false) + utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_cmake_mkldnn', false) utils.pack_lib('cmake_mkldnn_gpu', mx_cmake_mkldnn_lib, true) } } @@ -265,7 +265,7 @@ def compile_unix_cmake_gpu() { ws('workspace/build-cmake-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run('ubuntu_gpu_cu100', 'build_ubuntu_gpu_cmake', false) + utils.docker_run('ubuntu_gpu_cu101', 'build_ubuntu_gpu_cmake', false) utils.pack_lib('cmake_gpu', mx_cmake_lib_cython, true) } } @@ -662,7 +662,7 @@ def test_unix_python2_gpu() { ws('workspace/ut-python2-gpu') { try { utils.unpack_and_init('gpu', mx_lib, true) - python2_gpu_ut('ubuntu_gpu_cu100') + python2_gpu_ut('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { utils.collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python2_gpu.xml') @@ -679,7 +679,7 @@ def test_unix_python2_quantize_gpu() { timeout(time: max_time, unit: 'MINUTES') { try { utils.unpack_and_init('gpu', mx_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'unittest_ubuntu_python2_quantization_gpu', true) + utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_python2_quantization_gpu', true) utils.publish_test_coverage() } finally { utils.collect_test_results_unix('nosetests_quantization_gpu.xml', 'nosetests_python2_quantize_gpu.xml') @@ -696,7 +696,7 @@ def test_unix_python2_mkldnn_gpu() { ws('workspace/ut-python2-mkldnn-gpu') { try { utils.unpack_and_init('mkldnn_gpu', mx_mkldnn_lib, true) - python2_gpu_ut('ubuntu_gpu_cu100') + python2_gpu_ut('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { utils.collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python2_mkldnn_gpu.xml') @@ -746,7 +746,7 @@ def test_unix_python3_gpu() { ws('workspace/ut-python3-gpu') { try { utils.unpack_and_init('gpu', mx_lib_cython, true) - python3_gpu_ut_cython('ubuntu_gpu_cu100') + python3_gpu_ut_cython('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { utils.collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python3_gpu.xml') @@ -763,7 +763,7 @@ def test_unix_python3_quantize_gpu() { timeout(time: max_time, unit: 'MINUTES') { try { utils.unpack_and_init('gpu', mx_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'unittest_ubuntu_python3_quantization_gpu', true) + utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_python3_quantization_gpu', true) utils.publish_test_coverage() } finally { utils.collect_test_results_unix('nosetests_quantization_gpu.xml', 'nosetests_python3_quantize_gpu.xml') @@ -848,7 +848,7 @@ def test_unix_python3_mkldnn_gpu() { ws('workspace/ut-python3-mkldnn-gpu') { try { utils.unpack_and_init('mkldnn_gpu', mx_mkldnn_lib, true) - python3_gpu_ut('ubuntu_gpu_cu100') + python3_gpu_ut('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { utils.collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python3_mkldnn_gpu.xml') @@ -864,7 +864,7 @@ def test_unix_python3_mkldnn_nocudnn_gpu() { ws('workspace/ut-python3-mkldnn-gpu-nocudnn') { try { utils.unpack_and_init('mkldnn_gpu_nocudnn', mx_mkldnn_lib, true) - python3_gpu_ut_nocudnn('ubuntu_gpu_cu100') + python3_gpu_ut_nocudnn('ubuntu_gpu_cu101') utils.publish_test_coverage() } finally { utils.collect_test_results_unix('nosetests_gpu.xml', 'nosetests_python3_mkldnn_gpu_nocudnn.xml') @@ -898,7 +898,7 @@ def test_unix_python3_integration_gpu() { ws('workspace/it-python-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('gpu', mx_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'integrationtest_ubuntu_gpu_python', true) + utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_python', true) utils.publish_test_coverage() } } @@ -913,7 +913,7 @@ def test_unix_caffe_gpu() { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() utils.unpack_lib('gpu', mx_lib) - utils.docker_run('ubuntu_gpu_cu100', 'integrationtest_ubuntu_gpu_caffe', true) + utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_caffe', true) utils.publish_test_coverage() } } @@ -927,7 +927,7 @@ def test_unix_cpp_package_gpu() { ws('workspace/it-cpp-package') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('gpu', mx_lib_cpp_examples, true) - utils.docker_run('ubuntu_gpu_cu100', 'integrationtest_ubuntu_gpu_cpp_package', true) + utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_cpp_package', true) utils.publish_test_coverage() } } @@ -969,7 +969,7 @@ def test_unix_scala_gpu() { ws('workspace/ut-scala-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('gpu', mx_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'integrationtest_ubuntu_gpu_scala', true) + utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_scala', true) utils.publish_test_coverage() } } @@ -1052,7 +1052,7 @@ def test_unix_cpp_gpu() { ws('workspace/ut-cpp-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('cmake_gpu', mx_cmake_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'unittest_cpp', true) + utils.docker_run('ubuntu_gpu_cu101', 'unittest_cpp', true) utils.publish_test_coverage() } } @@ -1066,7 +1066,7 @@ def test_unix_cpp_mkldnn_gpu() { ws('workspace/ut-cpp-mkldnn-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('cmake_mkldnn_gpu', mx_cmake_mkldnn_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'unittest_cpp', true) + utils.docker_run('ubuntu_gpu_cu101', 'unittest_cpp', true) utils.publish_test_coverage() } } @@ -1094,7 +1094,7 @@ def test_unix_perl_gpu() { ws('workspace/ut-perl-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('gpu', mx_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'unittest_ubuntu_cpugpu_perl', true) + utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_cpugpu_perl', true) utils.publish_test_coverage() } } @@ -1108,7 +1108,7 @@ def test_unix_r_gpu() { ws('workspace/ut-r-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('gpu', mx_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'unittest_ubuntu_gpu_R', true) + utils.docker_run('ubuntu_gpu_cu101', 'unittest_ubuntu_gpu_R', true) utils.publish_test_coverage() } } @@ -1176,7 +1176,7 @@ def test_unix_distributed_kvstore_gpu() { ws('workspace/it-dist-kvstore') { timeout(time: max_time, unit: 'MINUTES') { utils.unpack_and_init('gpu', mx_lib, true) - utils.docker_run('ubuntu_gpu_cu100', 'integrationtest_ubuntu_gpu_dist_kvstore', true) + utils.docker_run('ubuntu_gpu_cu101', 'integrationtest_ubuntu_gpu_dist_kvstore', true) utils.publish_test_coverage() } } From 7ec3c0a1b3cbdfbf3f7bb828526b35c27d6162df Mon Sep 17 00:00:00 2001 From: stu1130 Date: Sat, 18 May 2019 20:32:17 -0700 Subject: [PATCH 04/18] clean up code & create cu101 docker file --- ci/docker/Dockerfile.build.ubuntu_gpu_cu101 | 82 +++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 ci/docker/Dockerfile.build.ubuntu_gpu_cu101 diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 new file mode 100644 index 000000000000..35f9d1d6c6b8 --- /dev/null +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 @@ -0,0 +1,82 @@ +# -*- mode: dockerfile -*- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# Dockerfile to run MXNet on Ubuntu 16.04 for GPU + +FROM nvidia/cuda:10.1-devel-ubuntu16.04 + +WORKDIR /work/deps + +COPY install/ubuntu_core.sh /work/ +RUN /work/ubuntu_core.sh + +COPY install/deb_ubuntu_ccache.sh /work/ +RUN /work/deb_ubuntu_ccache.sh + +COPY install/ubuntu_python.sh /work/ +RUN /work/ubuntu_python.sh + +COPY install/ubuntu_scala.sh /work/ +COPY install/sbt.gpg /work/ +RUN /work/ubuntu_scala.sh + +COPY install/ubuntu_r.sh /work/ +COPY install/r.gpg /work/ +RUN /work/ubuntu_r.sh + +COPY install/ubuntu_perl.sh /work/ +RUN /work/ubuntu_perl.sh + +COPY install/ubuntu_clang.sh /work/ +RUN /work/ubuntu_clang.sh + +COPY install/ubuntu_mklml.sh /work/ +RUN /work/ubuntu_mklml.sh + +COPY install/ubuntu_tvm.sh /work/ +RUN /work/ubuntu_tvm.sh + +COPY install/ubuntu_llvm.sh /work/ +RUN /work/ubuntu_llvm.sh + +COPY install/ubuntu_caffe.sh /work/ +RUN /work/ubuntu_caffe.sh + +COPY install/ubuntu_onnx.sh /work/ +RUN /work/ubuntu_onnx.sh + +COPY install/ubuntu_docs.sh /work/ +COPY install/docs_requirements /work/ +RUN /work/ubuntu_docs.sh + +COPY install/ubuntu_tutorials.sh /work/ +RUN /work/ubuntu_tutorials.sh + +# Always last +ARG USER_ID=0 +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 From be3c89788e1b7a260742ee5638bc9eb17f2d1af6 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Sat, 18 May 2019 22:12:29 -0700 Subject: [PATCH 05/18] add cuda 10.1 --- ci/docker/install/ubuntu_cudnn.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/docker/install/ubuntu_cudnn.sh b/ci/docker/install/ubuntu_cudnn.sh index 3d260046b5e7..b773fea0f82f 100755 --- a/ci/docker/install/ubuntu_cudnn.sh +++ b/ci/docker/install/ubuntu_cudnn.sh @@ -32,6 +32,10 @@ fi apt-get update || true case ${CUDA_VERSION} in + 10\.1*) + export libcudnn7_version="${CUDNN_VERSION}-1+cuda10.1" + export libcudnn7_dev_version="${CUDNN_VERSION}-1+cuda10.1" + ;; 10\.0*) export libcudnn7_version="${CUDNN_VERSION}-1+cuda10.0" export libcudnn7_dev_version="${CUDNN_VERSION}-1+cuda10.0" From 59cb9e1d2aa34ecf43a45c07613b982b487db6dd Mon Sep 17 00:00:00 2001 From: stu1130 Date: Sat, 18 May 2019 23:10:39 -0700 Subject: [PATCH 06/18] update the miss groovy --- ci/jenkins/Jenkins_steps.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 44ce32a7b8c1..b55af1e94ac2 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -237,7 +237,7 @@ def compile_unix_full_gpu() { ws('workspace/build-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda100_cudnn7', false) + utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda101_cudnn7', false) utils.pack_lib('gpu', mx_lib_cpp_examples, true) } } From db49289478bdc899edd7833dea45d1b2dfb606d8 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Sat, 18 May 2019 23:12:51 -0700 Subject: [PATCH 07/18] change description --- ci/jenkins/Jenkins_steps.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index b55af1e94ac2..9cce6f9417a7 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -232,7 +232,7 @@ def compile_unix_mkldnn_nocudnn_gpu() { } def compile_unix_full_gpu() { - return ['GPU: CUDA10.0+cuDNN7': { + return ['GPU: CUDA10.1+cuDNN7': { node(NODE_LINUX_CPU) { ws('workspace/build-gpu') { timeout(time: max_time, unit: 'MINUTES') { From 47e89590fa66f76ca525d3af939d1f97d196818e Mon Sep 17 00:00:00 2001 From: stu1130 Date: Sun, 19 May 2019 20:47:44 -0700 Subject: [PATCH 08/18] move up the cudnn installation --- ci/docker/Dockerfile.build.ubuntu_gpu_cu101 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 index 35f9d1d6c6b8..32f0a0a8d862 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu101 @@ -67,16 +67,16 @@ RUN /work/ubuntu_docs.sh COPY install/ubuntu_tutorials.sh /work/ RUN /work/ubuntu_tutorials.sh +ENV CUDNN_VERSION=7.5.1.10 +COPY install/ubuntu_cudnn.sh /work/ +RUN /work/ubuntu_cudnn.sh + # Always last ARG USER_ID=0 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 From acb053e14d96de4e7849ceb8a888cceacc292390 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Sun, 19 May 2019 23:34:09 -0700 Subject: [PATCH 09/18] update label & func for nightly build --- tests/nightly/JenkinsfileForBinaries | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/nightly/JenkinsfileForBinaries b/tests/nightly/JenkinsfileForBinaries index e4b9ff1acbb1..68966aac880d 100755 --- a/tests/nightly/JenkinsfileForBinaries +++ b/tests/nightly/JenkinsfileForBinaries @@ -31,11 +31,11 @@ utils.assign_node_labels(utility: 'utility', linux_cpu: 'mxnetlinux-cpu', linux_ utils.main_wrapper( core_logic: { stage('Build') { - parallel 'GPU: CUDA9.1+cuDNN7': { + parallel 'GPU: CUDA10.1+cuDNN7': { node(NODE_LINUX_CPU) { ws('workspace/build-gpu') { utils.init_git() - utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda100_cudnn7', false) + utils.docker_run('ubuntu_build_cuda', 'build_ubuntu_gpu_cuda101_cudnn7', false) utils.pack_lib('gpu', mx_lib) } } From 775b76f2b8c52b774043633fadc5b8e7e1d0e42d Mon Sep 17 00:00:00 2001 From: stu1130 Date: Mon, 20 May 2019 22:43:04 -0700 Subject: [PATCH 10/18] update to cuda 10.1 --- ci/docker/install/ubuntu_nvidia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/install/ubuntu_nvidia.sh b/ci/docker/install/ubuntu_nvidia.sh index 36eb21b8a03e..41f68a21858b 100755 --- a/ci/docker/install/ubuntu_nvidia.sh +++ b/ci/docker/install/ubuntu_nvidia.sh @@ -22,4 +22,4 @@ set -ex # Retrieve ppa:graphics-drivers and install nvidia-drivers. # Note: DEBIAN_FRONTEND required to skip the interactive setup steps apt update -DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends cuda-10-0 +DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends cuda-10-1 From 5312633b13e4f1a286f84b391848cfac7e5fe938 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Wed, 22 May 2019 10:21:22 -0700 Subject: [PATCH 11/18] upgrade to build cu101mkl --- ci/docker/runtime_functions.sh | 4 ++-- ci/jenkins/Jenkins_steps.groovy | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 81512d32839a..18291806def7 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -1467,10 +1467,10 @@ build_static_python_mkl() { popd } -build_static_python_cu100mkl() { +build_static_python_cu101mkl() { set -ex pushd . - export mxnet_variant=cu100mkl + export mxnet_variant=cu101mkl ./ci/publish/python/build.sh popd } diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 9cce6f9417a7..dc689ecd4884 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -631,7 +631,7 @@ def test_static_python_gpu() { ws('workspace/ut-publish-python-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run("publish.ubuntu1404_gpu", 'build_static_python_cu100mkl', true) + utils.docker_run("publish.ubuntu1404_gpu", 'build_static_python_cu101mkl', true) } } } From d5a21532107ffaeb06b80144786994dfdcac71a8 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Wed, 22 May 2019 16:04:12 -0700 Subject: [PATCH 12/18] do not use nvidia docker in build static test --- ci/jenkins/Jenkins_steps.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index dc689ecd4884..7c5bd6ddd815 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -631,7 +631,7 @@ def test_static_python_gpu() { ws('workspace/ut-publish-python-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run("publish.ubuntu1404_gpu", 'build_static_python_cu101mkl', true) + utils.docker_run("publish.ubuntu1404_gpu", 'build_static_python_cu101mkl', false) } } } From d25aa92de868ae8856e313bcef8e1961600361b1 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Wed, 22 May 2019 16:22:40 -0700 Subject: [PATCH 13/18] fix cuda_patch_typo --- tools/setup_gpu_build_tools.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup_gpu_build_tools.sh b/tools/setup_gpu_build_tools.sh index a4cd2b431f3c..3786537b9939 100755 --- a/tools/setup_gpu_build_tools.sh +++ b/tools/setup_gpu_build_tools.sh @@ -29,7 +29,7 @@ DEPS_PATH=$2 >&2 echo "Setting CUDA versions for $VARIANT" if [[ $VARIANT == cu101* ]]; then CUDA_VERSION='10.1.105-1' - CUDA_PATCH_VERSION='10.1.105-1' + CUDA_PATCH_VERSION='10.1.0.105-1' LIBCUDA_VERSION='418.39-0ubuntu1' LIBCUDNN_VERSION='7.5.1.10-1+cuda10.1' LIBNCCL_VERSION='2.4.2-1+cuda10.1' From 0bf8b9fcba82977b6f290e250b60a045432db4f2 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Wed, 22 May 2019 22:11:32 -0700 Subject: [PATCH 14/18] use nvidia docker --- ci/jenkins/Jenkins_steps.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index 7c5bd6ddd815..ba8e6a63c4a2 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -605,7 +605,7 @@ def test_static_scala_cpu() { ws('workspace/ut-publish-scala-cpu') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run("publish.ubuntu1404_cpu", 'build_static_scala_mkl', false) + utils.docker_run("publish.ubuntu1404_cpu", 'build_static_scala_mkl', true) } } } From fa232a76755f7587ac17382c306822418a6cbeb3 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Wed, 22 May 2019 22:16:11 -0700 Subject: [PATCH 15/18] fix the right config --- ci/jenkins/Jenkins_steps.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/Jenkins_steps.groovy b/ci/jenkins/Jenkins_steps.groovy index ba8e6a63c4a2..dc689ecd4884 100644 --- a/ci/jenkins/Jenkins_steps.groovy +++ b/ci/jenkins/Jenkins_steps.groovy @@ -605,7 +605,7 @@ def test_static_scala_cpu() { ws('workspace/ut-publish-scala-cpu') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run("publish.ubuntu1404_cpu", 'build_static_scala_mkl', true) + utils.docker_run("publish.ubuntu1404_cpu", 'build_static_scala_mkl', false) } } } @@ -631,7 +631,7 @@ def test_static_python_gpu() { ws('workspace/ut-publish-python-gpu') { timeout(time: max_time, unit: 'MINUTES') { utils.init_git() - utils.docker_run("publish.ubuntu1404_gpu", 'build_static_python_cu101mkl', false) + utils.docker_run("publish.ubuntu1404_gpu", 'build_static_python_cu101mkl', true) } } } From e77f5732892787d92fd89014e53e7ce22145e45d Mon Sep 17 00:00:00 2001 From: stu1130 Date: Thu, 23 May 2019 11:06:12 -0700 Subject: [PATCH 16/18] use nvidia docker and install latest cuDNN --- ci/docker/Dockerfile.publish.ubuntu1404_gpu | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/docker/Dockerfile.publish.ubuntu1404_gpu b/ci/docker/Dockerfile.publish.ubuntu1404_gpu index 9855986a2891..8f2fec18fac4 100644 --- a/ci/docker/Dockerfile.publish.ubuntu1404_gpu +++ b/ci/docker/Dockerfile.publish.ubuntu1404_gpu @@ -18,13 +18,17 @@ # # Dockerfile to run MXNet on Ubuntu 14.04 for GPU -FROM ubuntu:14.04 +FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 WORKDIR /work/deps COPY install/ubuntu_publish.sh /work/ RUN /work/ubuntu_publish.sh +ENV CUDNN_VERSION=7.5.1.10 +COPY install/ubuntu_cudnn.sh /work/ +RUN /work/ubuntu_cudnn.sh + ARG USER_ID=0 ARG GROUP_ID=0 COPY install/ubuntu_adduser.sh /work/ From b9e1f0bb857d9df96c74e76a45bef59e61efb607 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Thu, 23 May 2019 11:20:09 -0700 Subject: [PATCH 17/18] fix the typo --- ci/docker/Dockerfile.publish.ubuntu1404_gpu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/Dockerfile.publish.ubuntu1404_gpu b/ci/docker/Dockerfile.publish.ubuntu1404_gpu index 8f2fec18fac4..5472e5799251 100644 --- a/ci/docker/Dockerfile.publish.ubuntu1404_gpu +++ b/ci/docker/Dockerfile.publish.ubuntu1404_gpu @@ -18,7 +18,7 @@ # # Dockerfile to run MXNet on Ubuntu 14.04 for GPU -FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu16.04 +FROM nvidia/cuda:10.1-cudnn7-devel-ubuntu14.04 WORKDIR /work/deps From cf076c3ae01d3b56ad13f981279c597435658de9 Mon Sep 17 00:00:00 2001 From: stu1130 Date: Thu, 23 May 2019 12:43:54 -0700 Subject: [PATCH 18/18] use default cudnn --- ci/docker/Dockerfile.publish.ubuntu1404_gpu | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/docker/Dockerfile.publish.ubuntu1404_gpu b/ci/docker/Dockerfile.publish.ubuntu1404_gpu index 5472e5799251..4d9fa819a39e 100644 --- a/ci/docker/Dockerfile.publish.ubuntu1404_gpu +++ b/ci/docker/Dockerfile.publish.ubuntu1404_gpu @@ -25,10 +25,6 @@ WORKDIR /work/deps COPY install/ubuntu_publish.sh /work/ RUN /work/ubuntu_publish.sh -ENV CUDNN_VERSION=7.5.1.10 -COPY install/ubuntu_cudnn.sh /work/ -RUN /work/ubuntu_cudnn.sh - ARG USER_ID=0 ARG GROUP_ID=0 COPY install/ubuntu_adduser.sh /work/