From a7b9e9be6f7c7a09c2699b0dd16a2e39eda157b5 Mon Sep 17 00:00:00 2001 From: Rohit Kumar Srivastava Date: Fri, 12 Mar 2021 20:21:13 +0000 Subject: [PATCH 1/4] Update Nightly CI image to ubuntu 18 --- ci/docker/Dockerfile.build.ubuntu_nightly_cpu | 4 ++-- ci/docker/Dockerfile.build.ubuntu_nightly_gpu | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu index b9c275e00919..65ea937c4582 100644 --- a/ci/docker/Dockerfile.build.ubuntu_nightly_cpu +++ b/ci/docker/Dockerfile.build.ubuntu_nightly_cpu @@ -16,9 +16,9 @@ # specific language governing permissions and limitations # under the License. # -# Dockerfile to build and run MXNet on Ubuntu 16.04 for CPU +# Dockerfile to build and run MXNet on Ubuntu 18.04 for CPU -FROM ubuntu:16.04 +FROM ubuntu:18.04 WORKDIR /work/deps diff --git a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu index 216e96fcebb8..c2d255bfe26c 100644 --- a/ci/docker/Dockerfile.build.ubuntu_nightly_gpu +++ b/ci/docker/Dockerfile.build.ubuntu_nightly_gpu @@ -16,9 +16,9 @@ # specific language governing permissions and limitations # under the License. # -# Dockerfile to run MXNet on Ubuntu 16.04 for CPU +# Dockerfile to run MXNet on Ubuntu 18.04 for GPU -FROM nvidia/cuda:10.1-devel-ubuntu16.04 +FROM nvidia/cuda:10.1-devel-ubuntu18.04 WORKDIR /work/deps @@ -67,10 +67,12 @@ RUN /work/ubuntu_tutorials.sh COPY install/ubuntu_nightly_tests.sh /work/ RUN /work/ubuntu_nightly_tests.sh -ENV CUDNN_VERSION=7.6.0.64 +ENV CUDA_VERSION=10.1.105 +ENV CUDNN_VERSION=7.6.5.32 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/ From 72bb5871e8b4762588dbdf19a9a345358328a4e2 Mon Sep 17 00:00:00 2001 From: Rohit Kumar Srivastava Date: Fri, 12 Mar 2021 20:39:59 +0000 Subject: [PATCH 2/4] updating docker images of ubuntu rat check to ubuntu 18 --- ci/docker/Dockerfile.build.ubuntu_rat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_rat b/ci/docker/Dockerfile.build.ubuntu_rat index 234d2e42e946..cc5ead675177 100644 --- a/ci/docker/Dockerfile.build.ubuntu_rat +++ b/ci/docker/Dockerfile.build.ubuntu_rat @@ -18,7 +18,7 @@ # # Dockerfile to run the Apache RAT license check -FROM ubuntu:16.04 +FROM ubuntu:18.04 WORKDIR /work/deps From 6019b5e1bbb3615ab09839a76cffd6337fb85450 Mon Sep 17 00:00:00 2001 From: Rohit Kumar Srivastava Date: Mon, 15 Mar 2021 20:48:12 +0000 Subject: [PATCH 3/4] Set maven version to 3.6.x for ubuntu 18 to fix rat license checker --- ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt | 2 +- ci/docker/install/ubuntu_rat.sh | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt b/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt index 9556fee57f03..30b6b5d27176 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_tensorrt @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -# Dockerfile to run MXNet on Ubuntu 16.04 for CPU +# Dockerfile to run MXNet on Ubuntu 18.04 for CPU FROM nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04 diff --git a/ci/docker/install/ubuntu_rat.sh b/ci/docker/install/ubuntu_rat.sh index 917d0b683e28..d1e17c8e3182 100755 --- a/ci/docker/install/ubuntu_rat.sh +++ b/ci/docker/install/ubuntu_rat.sh @@ -21,7 +21,23 @@ set -ex echo "Install dependencies" apt-get update || true -apt-get install -y subversion maven openjdk-8-jdk openjdk-8-jre +apt-get install -y curl subversion openjdk-8-jdk openjdk-8-jre software-properties-common +apt-add-repository ppa:webupd8team/java +apt-get update + +# Installing maven 3.6.3 because default maven 3.7.x requires maven compiler >= 1.6 +url="https://mirror.olnevhost.net/pub/apache/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz" +install_dir="/opt/maven" +mkdir ${install_dir} +curl -fsSL ${url} | tar zx --strip-components=1 -C ${install_dir} +cat << EOF > /etc/profile.d/maven.sh +#!/bin/sh +export M2_HOME=${install_dir} +export MAVEN_HOME=${install_dir} +export PATH=${install_dir}/bin:${PATH} +EOF +source /etc/profile.d/maven.sh +cat /etc/profile.d/maven.sh echo "download RAT" #svn co http://svn.apache.org/repos/asf/creadur/rat/trunk/ From fbe9a15ee7d471ee377ba66ebd1278ef2f57f40e Mon Sep 17 00:00:00 2001 From: Rohit Kumar Srivastava Date: Mon, 15 Mar 2021 22:35:19 +0000 Subject: [PATCH 4/4] using alternate URL for downloading MNIST dataset --- cpp-package/example/get_data.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cpp-package/example/get_data.sh b/cpp-package/example/get_data.sh index 77677c320c1b..fda69ce2f087 100755 --- a/cpp-package/example/get_data.sh +++ b/cpp-package/example/get_data.sh @@ -53,16 +53,12 @@ download () { # MNIST dataset from: http://yann.lecun.com/exdb/mnist/ FILES=( - "http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz" - "http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz" - "http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz" - "http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz" + "https://web.archive.org/web/20160828233817/http://yann.lecun.com/exdb/mnist/train-images-idx3-ubyte.gz" + "https://web.archive.org/web/20160828233817/http://yann.lecun.com/exdb/mnist/train-labels-idx1-ubyte.gz" + "https://web.archive.org/web/20160828233817/http://yann.lecun.com/exdb/mnist/t10k-images-idx3-ubyte.gz" + "https://web.archive.org/web/20160828233817/http://yann.lecun.com/exdb/mnist/t10k-labels-idx1-ubyte.gz" "http://data.mxnet.io/data/mnist_train.csv.gz") for FILE in ${FILES[@]}; do - if curl --output /dev/null --silent --head --fail "$FILE"; then - download ${FILE} - else - download "https://web.archive.org/web/20160828233817/$FILE" - fi + download ${FILE} done