[mxnet] branch update_cuda updated: Additional updates

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jevans pushed a commit to branch update_cuda
in repository https://gitbox.apache.org/repos/asf/mxnet.git


The following commit(s) were added to refs/heads/update_cuda by this push:
     new cf7d6408da Additional updates
cf7d6408da is described below

commit cf7d6408daacb1a7d5828bea0e4869c80ec9738c
Author: Joe Evans <jo...@gmail.com>
AuthorDate: Fri Sep 1 13:14:14 2023 -0700

    Additional updates
---
 cd/Jenkinsfile_cd_pipeline     |  2 +-
 cd/Jenkinsfile_release_job     |  2 +-
 cd/utils/mxnet_base_image.sh   | 13 +++++--------
 ci/docker/runtime_functions.sh |  6 ++----
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/cd/Jenkinsfile_cd_pipeline b/cd/Jenkinsfile_cd_pipeline
index 426437d80e..9e38c9ed5c 100644
--- a/cd/Jenkinsfile_cd_pipeline
+++ b/cd/Jenkinsfile_cd_pipeline
@@ -36,7 +36,7 @@ pipeline {
 
   parameters {
     // Release parameters
-    string(defaultValue: "cpu,native,cu101,cu102,cu110,cu112", description: "Comma separated list of variants", name: "MXNET_VARIANTS")
+    string(defaultValue: "cpu,native,cu118", description: "Comma separated list of variants", name: "MXNET_VARIANTS")
     booleanParam(defaultValue: false, description: 'Whether this is a release build or not', name: "RELEASE_BUILD")
   }
 
diff --git a/cd/Jenkinsfile_release_job b/cd/Jenkinsfile_release_job
index f392fa7aec..6501fb6fd3 100644
--- a/cd/Jenkinsfile_release_job
+++ b/cd/Jenkinsfile_release_job
@@ -43,7 +43,7 @@ pipeline {
     // any disruption caused by different COMMIT_ID values chaning the job parameter configuration on
     // Jenkins.
     string(defaultValue: "mxnet_lib", description: "Pipeline to build", name: "RELEASE_JOB_TYPE")
-    string(defaultValue: "cpu,native,cu101,cu102,cu110,cu112", description: "Comma separated list of variants", name: "MXNET_VARIANTS")
+    string(defaultValue: "cpu,native,cu118", description: "Comma separated list of variants", name: "MXNET_VARIANTS")
     booleanParam(defaultValue: false, description: 'Whether this is a release build or not', name: "RELEASE_BUILD")
     string(defaultValue: "nightly", description: "String used for naming docker images", name: "VERSION")
   }
diff --git a/cd/utils/mxnet_base_image.sh b/cd/utils/mxnet_base_image.sh
index 1701a884a7..4396031f84 100755
--- a/cd/utils/mxnet_base_image.sh
+++ b/cd/utils/mxnet_base_image.sh
@@ -21,17 +21,14 @@
 mxnet_variant=${1:?"Please specify the mxnet variant as the first parameter"}
 
 case ${mxnet_variant} in
-    cu101*)
-    echo "nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04"
-    ;;
-    cu102*)
-    echo "nvidia/cuda:10.2-cudnn7-runtime-ubuntu18.04"
-    ;;
     cu110*)
-    echo "nvidia/cuda:11.0-cudnn8-runtime-ubuntu18.04"
+    echo "nvidia/cuda:11.0.3-cudnn8-runtime-ubuntu18.04"
     ;;
     cu112*)
-    echo "nvidia/cuda:11.2.0-cudnn8-runtime-ubuntu18.04"
+    echo "nvidia/cuda:11.2.2-cudnn8-runtime-ubuntu18.04"
+    ;;
+    cu118*)
+    echo "nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu18.04"
     ;;
     cpu)
     echo "ubuntu:18.04"
diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 1c3e00b7be..f01d21c861 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -746,8 +746,7 @@ sanity_cpp() {
 }
 
 sanity_python_prospector() {
-    set -e
-    set +x
+    set -ex
 
     # Run Prospector
     python3 -m prospector --profile prospector.yaml | tee prospector-output.txt
@@ -761,8 +760,7 @@ sanity_python_prospector() {
 }
 
 sanity_clang() {
-    set -e
-    set +x
+    set -ex
     # .github/workgflows/greetings.yml passes BASE_SHA, GITHUB_RUN_ID, GITHUB_BASE_REF for pull requests.
     BASE_SHA="${GITHUB_PR_BASE_SHA}"
     GITHUB_RUN_ID="${GITHUB_PR_RUN_ID}"