From b0a91a38dafc8c18baac8a9c9cbc34d8ed5af5d8 Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Thu, 9 Apr 2020 15:46:17 -0700 Subject: [PATCH 1/3] Use devtoolset-6. --- jvm-packages/dev/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jvm-packages/dev/Dockerfile b/jvm-packages/dev/Dockerfile index a767163e6bc7..02df129cf946 100644 --- a/jvm-packages/dev/Dockerfile +++ b/jvm-packages/dev/Dockerfile @@ -24,7 +24,7 @@ RUN \ yum install -y tar unzip wget xz git centos-release-scl yum-utils java-1.8.0-openjdk-devel && \ yum-config-manager --enable centos-sclo-rh-testing && \ yum -y update && \ - yum install -y devtoolset-4-gcc devtoolset-4-binutils devtoolset-4-gcc-c++ && \ + yum install -y devtoolset-6-gcc devtoolset-6-binutils devtoolset-6-gcc-c++ && \ # Python wget https://repo.continuum.io/miniconda/Miniconda3-4.5.12-Linux-x86_64.sh && \ bash Miniconda3-4.5.12-Linux-x86_64.sh -b -p /opt/python && \ @@ -38,9 +38,9 @@ RUN \ # Set the required environment variables ENV PATH=/opt/python/bin:/opt/maven/bin:$PATH -ENV CC=/opt/rh/devtoolset-4/root/usr/bin/gcc -ENV CXX=/opt/rh/devtoolset-4/root/usr/bin/c++ -ENV CPP=/opt/rh/devtoolset-4/root/usr/bin/cpp +ENV CC=/opt/rh/devtoolset-6/root/usr/bin/gcc +ENV CXX=/opt/rh/devtoolset-6/root/usr/bin/c++ +ENV CPP=/opt/rh/devtoolset-6/root/usr/bin/cpp ENV JAVA_HOME=/usr/lib/jvm/java # Install Python packages From 41bb7a989050df7ef541b0085fcc8bde50ae425b Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 11 Apr 2020 03:02:36 -0700 Subject: [PATCH 2/3] [CI] Use devtoolset-6 because devtoolset-4 is EOL and no longer available --- tests/ci_build/Dockerfile.gpu_build | 8 ++++---- tests/ci_build/Dockerfile.jvm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/ci_build/Dockerfile.gpu_build b/tests/ci_build/Dockerfile.gpu_build index 052408f616cf..295c1b301c13 100644 --- a/tests/ci_build/Dockerfile.gpu_build +++ b/tests/ci_build/Dockerfile.gpu_build @@ -10,7 +10,7 @@ RUN \ yum install -y tar unzip wget xz git centos-release-scl yum-utils && \ yum-config-manager --enable centos-sclo-rh-testing && \ yum -y update && \ - yum install -y devtoolset-4-gcc devtoolset-4-binutils devtoolset-4-gcc-c++ && \ + yum install -y devtoolset-6-gcc devtoolset-6-binutils devtoolset-6-gcc-c++ && \ # Python wget https://repo.continuum.io/miniconda/Miniconda3-4.5.12-Linux-x86_64.sh && \ bash Miniconda3-4.5.12-Linux-x86_64.sh -b -p /opt/python && \ @@ -29,9 +29,9 @@ RUN \ rm -f nvidia-machine-learning-repo-rhel7-1.0.0-1.x86_64.rpm; ENV PATH=/opt/python/bin:$PATH -ENV CC=/opt/rh/devtoolset-4/root/usr/bin/gcc -ENV CXX=/opt/rh/devtoolset-4/root/usr/bin/c++ -ENV CPP=/opt/rh/devtoolset-4/root/usr/bin/cpp +ENV CC=/opt/rh/devtoolset-6/root/usr/bin/gcc +ENV CXX=/opt/rh/devtoolset-6/root/usr/bin/c++ +ENV CPP=/opt/rh/devtoolset-6/root/usr/bin/cpp # Install Python packages RUN \ diff --git a/tests/ci_build/Dockerfile.jvm b/tests/ci_build/Dockerfile.jvm index 6bbcbc800a4a..c6739ce4049a 100644 --- a/tests/ci_build/Dockerfile.jvm +++ b/tests/ci_build/Dockerfile.jvm @@ -6,7 +6,7 @@ RUN \ yum install -y tar unzip wget xz git centos-release-scl yum-utils java-1.8.0-openjdk-devel && \ yum-config-manager --enable centos-sclo-rh-testing && \ yum -y update && \ - yum install -y devtoolset-4-gcc devtoolset-4-binutils devtoolset-4-gcc-c++ && \ + yum install -y devtoolset-6-gcc devtoolset-6-binutils devtoolset-6-gcc-c++ && \ # Python wget https://repo.continuum.io/miniconda/Miniconda3-4.5.12-Linux-x86_64.sh && \ bash Miniconda3-4.5.12-Linux-x86_64.sh -b -p /opt/python && \ @@ -19,9 +19,9 @@ RUN \ ln -s /opt/apache-maven-3.6.1/ /opt/maven ENV PATH=/opt/python/bin:/opt/maven/bin:$PATH -ENV CC=/opt/rh/devtoolset-4/root/usr/bin/gcc -ENV CXX=/opt/rh/devtoolset-4/root/usr/bin/c++ -ENV CPP=/opt/rh/devtoolset-4/root/usr/bin/cpp +ENV CC=/opt/rh/devtoolset-6/root/usr/bin/gcc +ENV CXX=/opt/rh/devtoolset-6/root/usr/bin/c++ +ENV CPP=/opt/rh/devtoolset-6/root/usr/bin/cpp # Install Python packages RUN \ From ae262265c4308b96555abb2cb0b43a1fb4e5dfa1 Mon Sep 17 00:00:00 2001 From: Hyunsu Cho Date: Sat, 11 Apr 2020 18:31:56 -0700 Subject: [PATCH 3/3] CUDA 9.0 doesn't work with devtoolset-6; use devtoolset-4 for GPU build only --- tests/ci_build/Dockerfile.gpu_build | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/ci_build/Dockerfile.gpu_build b/tests/ci_build/Dockerfile.gpu_build index 295c1b301c13..b6a9b15272a6 100644 --- a/tests/ci_build/Dockerfile.gpu_build +++ b/tests/ci_build/Dockerfile.gpu_build @@ -3,6 +3,7 @@ FROM nvidia/cuda:$CUDA_VERSION-devel-centos6 # Environment ENV DEBIAN_FRONTEND noninteractive +ENV DEVTOOLSET_URL_ROOT http://mirror.centos.org/centos/6/sclo/x86_64/rh/devtoolset-4 # Install all basic requirements RUN \ @@ -10,7 +11,11 @@ RUN \ yum install -y tar unzip wget xz git centos-release-scl yum-utils && \ yum-config-manager --enable centos-sclo-rh-testing && \ yum -y update && \ - yum install -y devtoolset-6-gcc devtoolset-6-binutils devtoolset-6-gcc-c++ && \ + yum install -y $DEVTOOLSET_URL_ROOT/devtoolset-4-gcc-5.3.1-6.1.el6.x86_64.rpm \ + $DEVTOOLSET_URL_ROOT/devtoolset-4-gcc-c++-5.3.1-6.1.el6.x86_64.rpm \ + $DEVTOOLSET_URL_ROOT/devtoolset-4-binutils-2.25.1-8.el6.x86_64.rpm \ + $DEVTOOLSET_URL_ROOT/devtoolset-4-runtime-4.1-3.sc1.el6.x86_64.rpm \ + $DEVTOOLSET_URL_ROOT/devtoolset-4-libstdc++-devel-5.3.1-6.1.el6.x86_64.rpm && \ # Python wget https://repo.continuum.io/miniconda/Miniconda3-4.5.12-Linux-x86_64.sh && \ bash Miniconda3-4.5.12-Linux-x86_64.sh -b -p /opt/python && \ @@ -29,9 +34,9 @@ RUN \ rm -f nvidia-machine-learning-repo-rhel7-1.0.0-1.x86_64.rpm; ENV PATH=/opt/python/bin:$PATH -ENV CC=/opt/rh/devtoolset-6/root/usr/bin/gcc -ENV CXX=/opt/rh/devtoolset-6/root/usr/bin/c++ -ENV CPP=/opt/rh/devtoolset-6/root/usr/bin/cpp +ENV CC=/opt/rh/devtoolset-4/root/usr/bin/gcc +ENV CXX=/opt/rh/devtoolset-4/root/usr/bin/c++ +ENV CPP=/opt/rh/devtoolset-4/root/usr/bin/cpp # Install Python packages RUN \