From 7aed8f3d48cb08027cfda8a66fdd0c00a1c7b05e Mon Sep 17 00:00:00 2001 From: Philip Hyunsu Cho Date: Thu, 28 Mar 2019 00:21:21 -0700 Subject: [PATCH] [CI] Upgrade to GCC 5.3.1, CMake 3.6.0 (#4306) * Upgrade to GCC 5.3.1, CMake 3.6.0 * is now okay --- tests/ci_build/Dockerfile.gpu | 17 +++++++++-------- tests/travis/run_test.sh | 5 ----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/tests/ci_build/Dockerfile.gpu b/tests/ci_build/Dockerfile.gpu index fa3b914dd..a97b4043c 100644 --- a/tests/ci_build/Dockerfile.gpu +++ b/tests/ci_build/Dockerfile.gpu @@ -7,15 +7,16 @@ ENV DEBIAN_FRONTEND noninteractive # Install all basic requirements RUN \ yum -y update && \ - yum install -y tar unzip wget xz git && \ - wget http://people.centos.org/tru/devtools-2/devtools-2.repo -O /etc/yum.repos.d/devtools-2.repo && \ - yum install -y devtoolset-2-gcc devtoolset-2-binutils devtoolset-2-gcc-c++ && \ + 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++ && \ # Python wget https://repo.continuum.io/miniconda/Miniconda2-4.3.27-Linux-x86_64.sh && \ bash Miniconda2-4.3.27-Linux-x86_64.sh -b -p /opt/python && \ # CMake - wget -nv -nc https://cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.sh --no-check-certificate && \ - bash cmake-3.5.2-Linux-x86_64.sh --skip-license --prefix=/usr + wget -nv -nc https://cmake.org/files/v3.6/cmake-3.6.0-Linux-x86_64.sh --no-check-certificate && \ + bash cmake-3.6.0-Linux-x86_64.sh --skip-license --prefix=/usr # NCCL2 (License: https://docs.nvidia.com/deeplearning/sdk/nccl-sla/index.html) RUN \ @@ -34,9 +35,9 @@ RUN \ rm -f nvidia-machine-learning-repo-rhel7-1.0.0-1.x86_64.rpm; fi ENV PATH=/opt/python/bin:$PATH -ENV CC=/opt/rh/devtoolset-2/root/usr/bin/gcc -ENV CXX=/opt/rh/devtoolset-2/root/usr/bin/c++ -ENV CPP=/opt/rh/devtoolset-2/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 \ diff --git a/tests/travis/run_test.sh b/tests/travis/run_test.sh index ebf39d296..962237443 100755 --- a/tests/travis/run_test.sh +++ b/tests/travis/run_test.sh @@ -11,11 +11,6 @@ if [ ${TASK} == "lint" ]; then (cat logclean.txt|grep warning) && exit -1 (cat logclean.txt|grep error) && exit -1 - if grep -R '' src include tests/cpp plugin jvm-packages amalgamation; then - echo 'Do not use std::regex, since it is not supported by GCC 4.8.x' - exit -1 - fi - exit 0 fi