diff --git a/ci/docker/Dockerfile.build.centos7 b/ci/docker/Dockerfile.build.centos7 index 15f5c7af2164..2a335848dcb2 100644 --- a/ci/docker/Dockerfile.build.centos7 +++ b/ci/docker/Dockerfile.build.centos7 @@ -51,7 +51,7 @@ RUN yum -y check-update || true && \ protobuf-devel \ # CentOS Software Collections https://www.softwarecollections.org devtoolset-7 \ - rh-python35 \ + rh-python36 \ rh-maven35 \ # Libraries # Provide clbas headerfiles @@ -71,7 +71,7 @@ RUN yum -y check-update || true && \ # Make GCC7, Python 3.5 and Maven 3.3 Software Collections available by default # during build and runtime of this container -SHELL [ "/usr/bin/scl", "enable", "devtoolset-7", "rh-python35", "rh-maven35" ] +SHELL [ "/usr/bin/scl", "enable", "devtoolset-7", "rh-python36", "rh-maven35" ] # Install minimum required cmake version RUN cd /usr/local/src && \ @@ -101,7 +101,8 @@ RUN pip3 install --no-cache-dir --upgrade pip && \ pytest-timeout==1.3.4 \ mock==2.0.0 \ onnx==1.5.0 \ - protobuf==3.5.2 + protobuf==3.5.2 \ + tabulate==0.7.5 ARG USER_ID=0 diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 5c38ab597318..458b1bc8a45a 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -980,7 +980,7 @@ sanity_check() { # $1 -> mxnet_variant: The variant of the libmxnet.so library cd_unittest_ubuntu() { set -ex - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable export PYTHONPATH=./python/ export MXNET_MKLDNN_DEBUG=0 # Ignored if not present export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 @@ -1091,7 +1091,7 @@ unittest_ubuntu_tensorrt_gpu() { unittest_ubuntu_python3_quantization_gpu() { set -ex if [ -f /etc/redhat-release ]; then - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable fi export PYTHONPATH=./python/ export MXNET_MKLDNN_DEBUG=0 # Ignored if not present @@ -1240,7 +1240,7 @@ unittest_ubuntu_cpu_julia10() { unittest_centos7_cpu() { set -ex - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable cd /work/mxnet python -m pytest --durations=50 --cov-report xml:tests_unittest.xml --verbose tests/python/unittest python -m pytest --durations=50 --cov-report xml:tests_train.xml --verbose tests/python/train @@ -1248,7 +1248,7 @@ unittest_centos7_cpu() { unittest_centos7_gpu() { set -ex - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable cd /work/mxnet export CUDNN_VERSION=${CUDNN_VERSION:-7.0.3} export DMLC_LOG_STACK_TRACE_DEPTH=10 @@ -1914,7 +1914,7 @@ build_static_libmxnet() { set -ex pushd . source /opt/rh/devtoolset-7/enable - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable export USE_SYSTEM_CUDA=1 local mxnet_variant=${1:?"This function requires a python command as the first argument"} source tools/staticbuild/build.sh ${mxnet_variant} @@ -1926,7 +1926,7 @@ cd_package_pypi() { set -ex pushd . source /opt/rh/devtoolset-7/enable - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable local mxnet_variant=${1:?"This function requires a python command as the first argument"} ./cd/python/pypi/pypi_package.sh ${mxnet_variant} popd @@ -1935,7 +1935,7 @@ cd_package_pypi() { # Sanity checks wheel file cd_integration_test_pypi() { set -ex - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable local gpu_enabled=${1:-"false"} @@ -1991,7 +1991,7 @@ build_static_python_cpu() { pushd . export mxnet_variant=cpu source /opt/rh/devtoolset-7/enable - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable ./ci/publish/python/build.sh popd } @@ -2002,7 +2002,7 @@ build_static_python_cu92() { export mxnet_variant=cu92 export USE_SYSTEM_CUDA=1 source /opt/rh/devtoolset-7/enable - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable ./ci/publish/python/build.sh popd } @@ -2013,7 +2013,7 @@ build_static_python_cpu_cmake() { export mxnet_variant=cpu export CMAKE_STATICBUILD=1 source /opt/rh/devtoolset-7/enable - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable ./ci/publish/python/build.sh popd } @@ -2025,7 +2025,7 @@ build_static_python_cu92_cmake() { export CMAKE_STATICBUILD=1 export USE_SYSTEM_CUDA=1 source /opt/rh/devtoolset-7/enable - source /opt/rh/rh-python35/enable + source /opt/rh/rh-python36/enable ./ci/publish/python/build.sh popd }