Additional updates

apache · Sep 1, 2023 · cf7d640 · cf7d640
1 parent 9abe5a9
commit cf7d640
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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}"