From c43e7d591f32c0ec3850703e30f0cbed2d598911 Mon Sep 17 00:00:00 2001 From: zha0q1 Date: Thu, 25 Feb 2021 22:09:58 +0000 Subject: [PATCH 1/7] update cude compt for cd --- ci/docker/runtime_functions.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 60431081baaf..8967bf6be7ad 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -985,6 +985,10 @@ cd_unittest_ubuntu() { # fi if [[ ${mxnet_variant} = cu* ]]; then + # update the cuda compatibity package because cd host uses nvidia driver 460 + sudo apt-get install -y cuda-compat-11-2 + ln -sfn /usr/local/cuda-11.2 /usr/local/cuda + $nose_cmd $NOSE_TIMER_ARGUMENTS --verbose tests/python/gpu # Adding these here as CI doesn't test all CUDA environments @@ -1082,6 +1086,11 @@ unittest_ubuntu_tensorrt_gpu() { # need to separte it from unittest_ubuntu_python3_gpu() unittest_ubuntu_python3_quantization_gpu() { set -ex + + # update the cuda compatibity package because cd host uses nvidia driver 460 + sudo apt-get install -y cuda-compat-11-2 + ln -sfn /usr/local/cuda-11.2 /usr/local/cuda + export PYTHONPATH=./python/ export MXNET_MKLDNN_DEBUG=0 # Ignored if not present export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 From 69bfea9249b2a61b8b1ca69ddd1563eed1347fa2 Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Thu, 25 Feb 2021 17:07:57 -0800 Subject: [PATCH 2/7] Update Dockerfile.build.ubuntu_gpu_cu102 --- ci/docker/Dockerfile.build.ubuntu_gpu_cu102 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 index f3b3f49fbd0b..30331d28e7d0 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 @@ -69,6 +69,8 @@ ENV CUDNN_VERSION=8.0.4.30 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh +RUN sudo apt-get install -y cuda-compat-11-2 + # Always last ARG USER_ID=0 ARG GROUP_ID=0 From 9b6a298d6e1296be32d3a9c47567784fd25bad2a Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Thu, 25 Feb 2021 18:42:18 -0800 Subject: [PATCH 3/7] Update Dockerfile.build.ubuntu_gpu_cu102 --- ci/docker/Dockerfile.build.ubuntu_gpu_cu102 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 index 30331d28e7d0..bc6939d8143f 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 @@ -69,7 +69,9 @@ ENV CUDNN_VERSION=8.0.4.30 COPY install/ubuntu_cudnn.sh /work/ RUN /work/ubuntu_cudnn.sh -RUN sudo apt-get install -y cuda-compat-11-2 +# update the cuda compatibity package because cd host uses nvidia driver 460 +RUN apt-get update && apt-get install -y cuda-compat-11-2 +Run ln -sfn /usr/local/cuda-11.2 /usr/local/cuda # Always last ARG USER_ID=0 From 4dba9d8e54dfdd207ae4cdb0e2b9993c97caf577 Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Thu, 25 Feb 2021 18:43:09 -0800 Subject: [PATCH 4/7] Update Dockerfile.build.ubuntu_gpu_cu110 --- ci/docker/Dockerfile.build.ubuntu_gpu_cu110 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 index 336b76e2a3e8..59a7c71e4d0c 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 @@ -32,6 +32,10 @@ COPY install/ubuntu_python.sh /work/ COPY install/requirements /work/ RUN /work/ubuntu_python.sh +# update the cuda compatibity package because cd host uses nvidia driver 460 +RUN apt-get update && apt-get install -y cuda-compat-11-2 +Run ln -sfn /usr/local/cuda-11.2 /usr/local/cuda + # Always last ARG USER_ID=0 ARG GROUP_ID=0 From 52d65038bb2c8249b1f6544fa09372bfee9f9c47 Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Thu, 25 Feb 2021 18:43:58 -0800 Subject: [PATCH 5/7] Update runtime_functions.sh --- ci/docker/runtime_functions.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh index 8967bf6be7ad..60431081baaf 100755 --- a/ci/docker/runtime_functions.sh +++ b/ci/docker/runtime_functions.sh @@ -985,10 +985,6 @@ cd_unittest_ubuntu() { # fi if [[ ${mxnet_variant} = cu* ]]; then - # update the cuda compatibity package because cd host uses nvidia driver 460 - sudo apt-get install -y cuda-compat-11-2 - ln -sfn /usr/local/cuda-11.2 /usr/local/cuda - $nose_cmd $NOSE_TIMER_ARGUMENTS --verbose tests/python/gpu # Adding these here as CI doesn't test all CUDA environments @@ -1086,11 +1082,6 @@ unittest_ubuntu_tensorrt_gpu() { # need to separte it from unittest_ubuntu_python3_gpu() unittest_ubuntu_python3_quantization_gpu() { set -ex - - # update the cuda compatibity package because cd host uses nvidia driver 460 - sudo apt-get install -y cuda-compat-11-2 - ln -sfn /usr/local/cuda-11.2 /usr/local/cuda - export PYTHONPATH=./python/ export MXNET_MKLDNN_DEBUG=0 # Ignored if not present export MXNET_STORAGE_FALLBACK_LOG_VERBOSE=0 From cedb28acb34af4645793d835e3695f73c1f673d6 Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Thu, 25 Feb 2021 18:45:09 -0800 Subject: [PATCH 6/7] Update Dockerfile.build.ubuntu_gpu_cu110 --- ci/docker/Dockerfile.build.ubuntu_gpu_cu110 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 index 59a7c71e4d0c..db1f606076b5 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu110 @@ -34,7 +34,7 @@ RUN /work/ubuntu_python.sh # update the cuda compatibity package because cd host uses nvidia driver 460 RUN apt-get update && apt-get install -y cuda-compat-11-2 -Run ln -sfn /usr/local/cuda-11.2 /usr/local/cuda +RUN ln -sfn /usr/local/cuda-11.2 /usr/local/cuda # Always last ARG USER_ID=0 From 4ed6ff8ed159e010ca3b8d71e63ad8717b800836 Mon Sep 17 00:00:00 2001 From: Zhaoqi Zhu Date: Thu, 25 Feb 2021 18:45:20 -0800 Subject: [PATCH 7/7] Update Dockerfile.build.ubuntu_gpu_cu102 --- ci/docker/Dockerfile.build.ubuntu_gpu_cu102 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 index bc6939d8143f..6c2582de5419 100644 --- a/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 +++ b/ci/docker/Dockerfile.build.ubuntu_gpu_cu102 @@ -71,7 +71,7 @@ RUN /work/ubuntu_cudnn.sh # update the cuda compatibity package because cd host uses nvidia driver 460 RUN apt-get update && apt-get install -y cuda-compat-11-2 -Run ln -sfn /usr/local/cuda-11.2 /usr/local/cuda +RUN ln -sfn /usr/local/cuda-11.2 /usr/local/cuda # Always last ARG USER_ID=0