diff --git a/.jenkins/check/config/filter_linklint.txt b/.jenkins/check/config/filter_linklint.txt index 52c85741895..f8e68f5fdcb 100644 --- a/.jenkins/check/config/filter_linklint.txt +++ b/.jenkins/check/config/filter_linklint.txt @@ -45,4 +45,6 @@ https://raw.githubusercontent.com/dmlc/web-data/master/tensorflow/models/object_ https://github.com/google/googletestcd https://github.com/dmlc/dgl/blob/master/examples/pytorch/gcn/train.pyfrom https://github.com/FrozenGene/tflite/releases/download/v1.13.1/tflite-1.13.1-py3-none-any.whlpip3 -https://github.com/siju-samuel/darknet/blob/master/ \ No newline at end of file +https://github.com/siju-samuel/darknet/blob/master/ +https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu +https://developer.download.nvidia.cn/compute/machine-learning/repos/ubuntu \ No newline at end of file diff --git a/scripts/install/ubuntu-gpu-conda.sh b/scripts/install/ubuntu-gpu-conda.sh index e5a91929a9c..3614c3a6baf 100644 --- a/scripts/install/ubuntu-gpu-conda.sh +++ b/scripts/install/ubuntu-gpu-conda.sh @@ -39,6 +39,10 @@ PYTHON_VERSION=${PYTHON_VERSION:-3.7} MINDSPORE_VERSION=${MINDSPORE_VERSION:-EMPTY} CUDA_VERSION=${CUDA_VERSION:-11.1} OPENMPI=${OPENMPI:-off} +release_info=$(lsb_release -a | grep Release) +UBUNTU_VERSION=${release_info//[!0-9]/} + +[[ "$UBUNTU_VERSION" == "2004" && "$CUDA_VERSION" == "10.1" ]] && echo "CUDA 10.1 is not supported on Ubuntu 20.04" && exit 1 version_less() { test "$(echo "$@" | tr ' ' '\n' | sort -rV | head -n 1)" != "$1"; @@ -144,13 +148,13 @@ cuda_url=${cuda_url_map[$CUDA_VERSION]} wget $cuda_url sudo sh ${cuda_url##*/} --silent --toolkit cd - -sudo apt-key adv --fetch-keys https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub -sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu1804/x86_64/ /" -sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/machine-learning/repos/ubuntu1804/x86_64/ /" +sudo apt-key adv --fetch-keys https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu${UBUNTU_VERSION}/x86_64/7fa2af80.pub +sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu${UBUNTU_VERSION}/x86_64/ /" +sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/machine-learning/repos/ubuntu${UBUNTU_VERSION}/x86_64/ /" sudo apt-get update declare -A cudnn_name_map=() cudnn_name_map["10.1"]="libcudnn7=7.6.5.32-1+cuda10.1 libcudnn7-dev=7.6.5.32-1+cuda10.1" -cudnn_name_map["11.1"]="libcudnn8=8.0.4.30-1+cuda11.1 libcudnn8-dev=8.0.4.30-1+cuda11.1" +cudnn_name_map["11.1"]="libcudnn8=8.0.5.39-1+cuda11.1 libcudnn8-dev=8.0.5.39-1+cuda11.1" sudo apt-get install --no-install-recommends ${cudnn_name_map[$CUDA_VERSION]} -y # add cuda to path diff --git a/scripts/install/ubuntu-gpu-pip.sh b/scripts/install/ubuntu-gpu-pip.sh index e068b4362eb..7cccb74cb8e 100644 --- a/scripts/install/ubuntu-gpu-pip.sh +++ b/scripts/install/ubuntu-gpu-pip.sh @@ -40,6 +40,10 @@ PYTHON_VERSION=${PYTHON_VERSION:-3.7} MINDSPORE_VERSION=${MINDSPORE_VERSION:EMPTY} CUDA_VERSION=${CUDA_VERSION:-11.1} OPENMPI=${OPENMPI:-off} +release_info=$(lsb_release -a | grep Release) +UBUNTU_VERSION=${release_info//[!0-9]/} + +[[ "$UBUNTU_VERSION" == "2004" && "$CUDA_VERSION" == "10.1" ]] && echo "CUDA 10.1 is not supported on Ubuntu 20.04" && exit 1 version_less() { test "$(echo "$@" | tr ' ' '\n' | sort -rV | head -n 1)" != "$1"; @@ -69,7 +73,7 @@ fi declare -A minimum_driver_version_map=() minimum_driver_version_map["10.1"]="418.39" minimum_driver_version_map["11.1"]="450.80.02" -driver_version=$(modinfo nvidia | grep ^version | awk '{printf $2}') +driver_version=$(nvidia-smi --query-gpu=driver_version --format=csv,noheader --id=0) if [[ $driver_version < ${minimum_driver_version_map[$CUDA_VERSION]} ]]; then echo "CUDA $CUDA_VERSION minimum required driver version is ${minimum_driver_version_map[$CUDA_VERSION]}, \ but current nvidia driver version is $driver_version, please upgrade your driver manually." @@ -95,7 +99,7 @@ sudo sed -i "s@http://.*archive.ubuntu.com@http://repo.huaweicloud.com@g" /etc/a sudo sed -i "s@http://.*security.ubuntu.com@http://repo.huaweicloud.com@g" /etc/apt/sources.list sudo apt-get update -sudo apt-get install curl make gcc-7 libgmp-dev linux-headers-"$(uname -r)" -y +sudo apt-get install curl make gcc-7 libgmp-dev -y # python sudo add-apt-repository -y ppa:deadsnakes/ppa @@ -116,13 +120,13 @@ cuda_url=${cuda_url_map[$CUDA_VERSION]} wget $cuda_url sudo sh ${cuda_url##*/} --silent --toolkit cd - -sudo apt-key adv --fetch-keys https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub -sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu1804/x86_64/ /" -sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/machine-learning/repos/ubuntu1804/x86_64/ /" +sudo apt-key adv --fetch-keys https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu${UBUNTU_VERSION}/x86_64/7fa2af80.pub +sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu${UBUNTU_VERSION}/x86_64/ /" +sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/machine-learning/repos/ubuntu${UBUNTU_VERSION}/x86_64/ /" sudo apt-get update declare -A cudnn_name_map=() cudnn_name_map["10.1"]="libcudnn7=7.6.5.32-1+cuda10.1 libcudnn7-dev=7.6.5.32-1+cuda10.1" -cudnn_name_map["11.1"]="libcudnn8=8.0.4.30-1+cuda11.1 libcudnn8-dev=8.0.4.30-1+cuda11.1" +cudnn_name_map["11.1"]="libcudnn8=8.0.5.39-1+cuda11.1 libcudnn8-dev=8.0.5.39-1+cuda11.1" sudo apt-get install --no-install-recommends ${cudnn_name_map[$CUDA_VERSION]} -y # add cuda to path diff --git a/scripts/install/ubuntu-gpu-source.sh b/scripts/install/ubuntu-gpu-source.sh index 372cc26b6da..0205432bec6 100644 --- a/scripts/install/ubuntu-gpu-source.sh +++ b/scripts/install/ubuntu-gpu-source.sh @@ -40,6 +40,10 @@ PYTHON_VERSION=${PYTHON_VERSION:-3.7} CUDA_VERSION=${CUDA_VERSION:-11.1} OPENMPI=${OPENMPI:-off} LLVM=${LLVM:-off} +release_info=$(lsb_release -a | grep Release) +UBUNTU_VERSION=${release_info//[!0-9]/} + +[[ "$UBUNTU_VERSION" == "2004" && "$CUDA_VERSION" == "10.1" ]] && echo "CUDA 10.1 is not supported on Ubuntu 20.04" && exit 1 available_py_version=(3.7 3.8 3.9) if [[ " ${available_py_version[*]} " != *" $PYTHON_VERSION "* ]]; then @@ -54,7 +58,7 @@ fi declare -A minimum_driver_version_map=() minimum_driver_version_map["10.1"]="418.39" minimum_driver_version_map["11.1"]="450.80.02" -driver_version=$(modinfo nvidia | grep ^version | awk '{printf $2}') +driver_version=$(nvidia-smi --query-gpu=driver_version --format=csv,noheader --id=0) if [[ $driver_version < ${minimum_driver_version_map[$CUDA_VERSION]} ]]; then echo "CUDA $CUDA_VERSION minimum required driver version is ${minimum_driver_version_map[$CUDA_VERSION]}, \ but current nvidia driver version is $driver_version, please upgrade your driver manually." @@ -126,13 +130,13 @@ cuda_url=${cuda_url_map[$CUDA_VERSION]} wget $cuda_url sudo sh ${cuda_url##*/} --silent --toolkit cd - -sudo apt-key adv --fetch-keys https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu1804/x86_64/7fa2af80.pub -sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu1804/x86_64/ /" -sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/machine-learning/repos/ubuntu1804/x86_64/ /" +sudo apt-key adv --fetch-keys https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu${UBUNTU_VERSION}/x86_64/7fa2af80.pub +sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/cuda/repos/ubuntu${UBUNTU_VERSION}/x86_64/ /" +sudo add-apt-repository "deb https://developer.download.nvidia.cn/compute/machine-learning/repos/ubuntu${UBUNTU_VERSION}/x86_64/ /" sudo apt-get update declare -A cudnn_name_map=() cudnn_name_map["10.1"]="libcudnn7=7.6.5.32-1+cuda10.1 libcudnn7-dev=7.6.5.32-1+cuda10.1" -cudnn_name_map["11.1"]="libcudnn8=8.0.4.30-1+cuda11.1 libcudnn8-dev=8.0.4.30-1+cuda11.1" +cudnn_name_map["11.1"]="libcudnn8=8.0.5.39-1+cuda11.1 libcudnn8-dev=8.0.5.39-1+cuda11.1" sudo apt-get install --no-install-recommends ${cudnn_name_map[$CUDA_VERSION]} -y # add cuda to path